X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/516b6790c6d6deca3138f8352ceb63f122edddc1..13c4d4b662a1ff4b2545ccc125b61c47ee4c38a3:/lib/service/servicemp3.cpp

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 12959a0e..34d09363 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -34,6 +34,7 @@ eServiceFactoryMP3::eServiceFactoryMP3()
 		extensions.push_back("vob");
 		extensions.push_back("wav");
 		extensions.push_back("wave");
+		extensions.push_back("m4v");
 		extensions.push_back("mkv");
 		extensions.push_back("avi");
 		extensions.push_back("divx");
@@ -42,7 +43,6 @@ eServiceFactoryMP3::eServiceFactoryMP3()
 		extensions.push_back("mp4");
 		extensions.push_back("mov");
 		extensions.push_back("m4a");
-		extensions.push_back("m2ts");
 		sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
 	}
 
@@ -236,7 +236,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
 		sourceinfo.containertype = ctAVI;
 		sourceinfo.is_video = TRUE;
 	}
-	else if ( strcasecmp(ext, ".mp4") == 0 || strcasecmp(ext, ".mov") == 0)
+	else if ( strcasecmp(ext, ".mp4") == 0 || strcasecmp(ext, ".mov") == 0 || strcasecmp(ext, ".m4v") == 0)
 	{
 		sourceinfo.containertype = ctMP4;
 		sourceinfo.is_video = TRUE;
@@ -302,7 +302,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
 		eDebug("eServiceMP3::sorry, can't play: missing gst-plugin-appsink");
 	else
 	{
-		g_signal_connect (subsink, "new-buffer", G_CALLBACK (gstCBsubtitleAvail), this);
+		m_subs_to_pull_handler_id = g_signal_connect (subsink, "new-buffer", G_CALLBACK (gstCBsubtitleAvail), this);
 		g_object_set (G_OBJECT (m_gst_playbin), "text-sink", subsink, NULL);
 	}
 
@@ -335,16 +335,28 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
 		m_gst_playbin = 0;
 	}
 
-	gst_element_set_state (m_gst_playbin, GST_STATE_PLAYING);
 	setBufferSize(m_buffer_size);
 }
 
 eServiceMP3::~eServiceMP3()
 {
+	// disconnect subtitle callback
+	GstElement *sink;
+	g_object_get (G_OBJECT (m_gst_playbin), "text-sink", &sink, NULL);
+	if (sink)
+	{
+		g_signal_handler_disconnect (sink, m_subs_to_pull_handler_id);
+		gst_object_unref(sink);
+	}
+
 	delete m_subtitle_widget;
+
+	// disconnect sync handler callback
+	gst_bus_set_sync_handler(gst_pipeline_get_bus (GST_PIPELINE (m_gst_playbin)), NULL, NULL);
+
 	if (m_state == stRunning)
 		stop();
-	
+
 	if (m_stream_tags)
 		gst_tag_list_free(m_stream_tags);
 	
@@ -355,7 +367,7 @@ eServiceMP3::~eServiceMP3()
 	}
 }
 
-DEFINE_REF(eServiceMP3);	
+DEFINE_REF(eServiceMP3);
 
 RESULT eServiceMP3::connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)
 {
@@ -366,25 +378,30 @@ RESULT eServiceMP3::connectEvent(const Slot2<void,iPlayableService*,int> &event,
 RESULT eServiceMP3::start()
 {
 	ASSERT(m_state == stIdle);
-	
+
 	m_state = stRunning;
 	if (m_gst_playbin)
 	{
 		eDebug("eServiceMP3::starting pipeline");
 		gst_element_set_state (m_gst_playbin, GST_STATE_PLAYING);
 	}
+
 	m_event(this, evStart);
+
 	return 0;
 }
 
 RESULT eServiceMP3::stop()
 {
 	ASSERT(m_state != stIdle);
+
 	if (m_state == stStopped)
 		return -1;
+
 	eDebug("eServiceMP3::stop %s", m_ref.path.c_str());
 	gst_element_set_state(m_gst_playbin, GST_STATE_NULL);
 	m_state = stStopped;
+
 	return 0;
 }