git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Components/SystemInfo.py: add new SystemInfo entry "DeepstandbySupport"
[enigma2.git]
/
lib
/
service
/
servicemp3.cpp
diff --git
a/lib/service/servicemp3.cpp
b/lib/service/servicemp3.cpp
index 7701d4d570a01c1683fab40b36e0d263f36b442e..34d09363b4be1d1be31b7568cec27a71b88467fb 100644
(file)
--- 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("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");
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("mp4");
extensions.push_back("mov");
extensions.push_back("m4a");
- extensions.push_back("m2ts");
sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
}
sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
}
@@
-236,7
+236,7
@@
eServiceMP3::eServiceMP3(eServiceReference ref)
sourceinfo.containertype = ctAVI;
sourceinfo.is_video = TRUE;
}
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;
{
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
{
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);
}
g_object_set (G_OBJECT (m_gst_playbin), "text-sink", subsink, NULL);
}
@@
-340,10
+340,23
@@
eServiceMP3::eServiceMP3(eServiceReference ref)
eServiceMP3::~eServiceMP3()
{
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;
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_state == stRunning)
stop();
-
+
if (m_stream_tags)
gst_tag_list_free(m_stream_tags);
if (m_stream_tags)
gst_tag_list_free(m_stream_tags);