From: Andreas Frisch <andreas.frisch@multimedia-labs.de>
Date: Mon, 6 Oct 2008 17:19:06 +0000 (+0000)
Subject: fix parsing of external .srt subtitle files
X-Git-Tag: 2.6.0~804
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/d88e147f82e17231d52e286d0ee6b3210cd8799e?hp=1ad414d8f1e8f7313669762e485323f2528b2463

fix parsing of external .srt subtitle files
---

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 8460372d..df9bfe07 100644
--- 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)