fix parsing of external .srt subtitle files

[enigma2.git] / lib / service / servicemp3.cpp

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 8ff816b164bc28458cd2d4165bd6a825d226d3b9..df9bfe07027a814afd8e695153bde71902b9e61f 100644 (file)
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -366,27 +366,23 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
                        if (stat(srt_filename, &buffer) == 0)
                        {
                                eDebug("subtitle file found: %s",srt_filename);
-                               GstElement *subsource;
-                               subsource = gst_element_factory_make ("filesrc", "srt_source");
-                               g_object_set (G_OBJECT (subsource), "location", filename, NULL);
-                               GstElement *parser = gst_element_factory_make("subparse", "srt_parse");
-                               eDebug ("subparse = %p", parser);
-                               GstElement *sink = gst_element_factory_make("fakesink", "srt_sink");
-                               eDebug ("fakesink = %p", sink);
+                               GstElement *subsource = gst_element_factory_make ("filesrc", "srt_source");
+                               g_object_set (G_OBJECT (subsource), "location", srt_filename, NULL);
+                               GstElement *parser = gst_element_factory_make("subparse", "parse_subtitles");
+                               GstElement *switch_subtitles = gst_element_factory_make ("input-selector", "switch_subtitles");
+                               GstElement *sink = gst_element_factory_make("fakesink", "sink_subtitles");
+                               gst_bin_add_many(GST_BIN (m_gst_pipeline), subsource, switch_subtitles, parser, sink, NULL);
+                               gst_element_link(subsource, switch_subtitles);
+                               gst_element_link(switch_subtitles, parser);
+                               gst_element_link(parser, sink);
+                               g_object_set (G_OBJECT(switch_subtitles), "select-all", TRUE, NULL);
                                g_object_set (G_OBJECT(sink), "signal-handoffs", TRUE, NULL);
-                               gst_bin_add_many(GST_BIN (m_gst_pipeline), subsource, parser, sink, NULL);
-                               gboolean res = gst_element_link(subsource, parser);
-                               eDebug ("parser link = %d", res);
-                               res = gst_element_link(parser, sink);
-                               eDebug ("sink link = %d", res);
+                               g_object_set (G_OBJECT(sink), "sync", TRUE, NULL);
                                g_signal_connect(sink, "handoff", G_CALLBACK(gstCBsubtitleAvail), this);
                                subtitleStream subs;
-//                             subs.element = sink;
+                               subs.language_code = std::string(".srt file");
                                m_subtitleStreams.push_back(subs);
                        }
-                       else
-                               eDebug("subtitle file not found: %s",srt_filename);
-
                        gst_bin_add_many(GST_BIN(m_gst_pipeline), source, videodemux, audio, queue_audio, video, queue_video, NULL);
                        switch_audio = gst_element_factory_make ("input-selector", "switch_audio");
                        if (switch_audio)
@@ -926,7 +922,7 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
                }
                for (std::vector<subtitleStream>::iterator IterSubtitleStream(m_subtitleStreams.begin()); IterSubtitleStream != m_subtitleStreams.end(); ++IterSubtitleStream)
                {
-                       if ( IterAudioStream->pad )
+                       if ( IterSubtitleStream->pad )
                        {
                                g_object_get(IterSubtitleStream->pad, "tags", &tags, NULL);
                                gchar *g_language;
@@ -1037,7 +1033,6 @@ void eServiceMP3::gstCBpadAdded(GstElement *decodebin, GstPad *pad, gpointer use
        }
        if (g_strrstr(type,"application/x-ssa") || g_strrstr(type,"application/x-ass"))
        {
-GstPadLinkReturn res;
                GstElement *switch_subtitles = gst_bin_get_by_name(pipeline,"switch_subtitles");
                if ( !switch_subtitles )
                {
@@ -1049,12 +1044,11 @@ GstPadLinkReturn res;
                        gst_bin_add_many(pipeline, switch_subtitles, parser, sink, NULL);
                        gst_element_link(switch_subtitles, parser);
                        gst_element_link(parser, sink);
-                       g_object_set (G_OBJECT(switch_subtitles), "select-all", TRUE, NULL);
                        g_object_set (G_OBJECT(sink), "signal-handoffs", TRUE, NULL);
                        g_signal_connect(sink, "handoff", G_CALLBACK(gstCBsubtitleAvail), _this);
                }
                GstPad *sinkpad = gst_element_get_request_pad (switch_subtitles, "sink%d");
-               res = gst_pad_link(pad, sinkpad);
+               gst_pad_link(pad, sinkpad);
                subtitleStream subs;
                subs.pad = sinkpad;
                _this->m_subtitleStreams.push_back(subs);
@@ -1136,12 +1130,11 @@ eAutoInitPtr<eServiceFactoryMP3> init_eServiceFactoryMP3(eAutoInitNumbers::servi
 
 void eServiceMP3::gstCBsubtitleAvail(GstElement *element, GstBuffer *buffer, GstPad *pad, gpointer user_data)
 {
-       eDebug("gstCBsubtitleAvail");
        const unsigned char *text = (unsigned char *)GST_BUFFER_DATA(buffer);
+       eDebug("gstCBsubtitleAvail: %s",text);
        eServiceMP3 *_this = (eServiceMP3*)user_data;
        if ( _this->m_subtitle_widget )
        {
-               eDebug("subtitle text: %s",text);
                eDVBTeletextSubtitlePage page;
                gRGB rgbcol(0xD0,0xD0,0xD0);
                page.m_elements.push_back(eDVBTeletextSubtitlePageElement(rgbcol, (const char*)text));
@@ -1184,7 +1177,6 @@ RESULT eServiceMP3::enableSubtitles(eWidget *parent, ePyObject tuple)
        sprintf(sinkpad, "sink%d", pid);
        g_object_set (G_OBJECT (switch_subtitles), "active-pad", gst_element_get_pad (switch_subtitles, sinkpad), NULL);
        g_object_get (G_OBJECT (switch_subtitles), "active-pad", &active_pad, NULL);
-       g_object_set (G_OBJECT (switch_subtitles), "select-all", FALSE, NULL);
        gchar *name;
        name = gst_pad_get_name (active_pad);
        eDebug ("switched subtitles to (%s)", name);