From: Fraxinas Date: Mon, 26 Jul 2010 10:37:04 +0000 (+0200) Subject: Merge branch 'bug_537_vobsub' of git.opendreambox.org:/git/enigma2 into bug_537_vobsub X-Git-Tag: 3.0.3~12^2~7 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/05d902ffb1a0dfb03cbb69324ceb20439b73c977?ds=sidebyside;hp=-c Merge branch 'bug_537_vobsub' of git.opendreambox.org:/git/enigma2 into bug_537_vobsub Conflicts: lib/python/Components/ConfigList.py lib/python/Screens/AudioSelection.py lib/service/servicemp3.cpp lib/service/servicemp3.h --- 05d902ffb1a0dfb03cbb69324ceb20439b73c977 diff --combined lib/service/servicemp3.cpp index 5fe15c1e,5cccbaea..8628c269 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@@ -21,7 -21,6 +21,7 @@@ #include #include +#define HTTP_TIMEOUT 10 static GstStaticPadTemplate subsinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS("text/plain; text/x-pango-markup; video/x-dvd-subpicture; subpicture/x-pgs")); // int ret = gst_pad_set_caps (ghostpad, caps2); // gst_caps_unref(caps2);)); @@@ -224,7 -223,6 +224,7 @@@ eServiceMP3::eServiceMP3(eServiceRefere { m_seekTimeout = eTimer::create(eApp); m_subtitle_sync_timer = eTimer::create(eApp); + m_streamingsrc_timeout = 0; m_subtitle_hide_timer = eTimer::create(eApp); m_stream_tags = 0; m_currentAudioStream = -1; @@@ -247,73 -245,63 +247,73 @@@ if (!ext) ext = filename; - sourceStream sourceinfo; - sourceinfo.is_video = FALSE; - sourceinfo.audiotype = atUnknown; + m_sourceinfo.is_video = FALSE; + m_sourceinfo.audiotype = atUnknown; if ( (strcasecmp(ext, ".mpeg") && strcasecmp(ext, ".mpg") && strcasecmp(ext, ".vob") && strcasecmp(ext, ".bin") && strcasecmp(ext, ".dat") ) == 0 ) { - sourceinfo.containertype = ctMPEGPS; - sourceinfo.is_video = TRUE; + m_sourceinfo.containertype = ctMPEGPS; + m_sourceinfo.is_video = TRUE; } else if ( strcasecmp(ext, ".ts") == 0 ) { - sourceinfo.containertype = ctMPEGTS; - sourceinfo.is_video = TRUE; + m_sourceinfo.containertype = ctMPEGTS; + m_sourceinfo.is_video = TRUE; } else if ( strcasecmp(ext, ".mkv") == 0 ) { - sourceinfo.containertype = ctMKV; - sourceinfo.is_video = TRUE; + m_sourceinfo.containertype = ctMKV; + m_sourceinfo.is_video = TRUE; } else if ( strcasecmp(ext, ".avi") == 0 || strcasecmp(ext, ".divx") == 0) { - sourceinfo.containertype = ctAVI; - sourceinfo.is_video = TRUE; + m_sourceinfo.containertype = ctAVI; + m_sourceinfo.is_video = TRUE; } else if ( strcasecmp(ext, ".mp4") == 0 || strcasecmp(ext, ".mov") == 0 || strcasecmp(ext, ".m4v") == 0) { - sourceinfo.containertype = ctMP4; - sourceinfo.is_video = TRUE; + m_sourceinfo.containertype = ctMP4; + m_sourceinfo.is_video = TRUE; } else if ( strcasecmp(ext, ".m4a") == 0 ) { - sourceinfo.containertype = ctMP4; - sourceinfo.audiotype = atAAC; + m_sourceinfo.containertype = ctMP4; + m_sourceinfo.audiotype = atAAC; } else if ( strcasecmp(ext, ".mp3") == 0 ) - sourceinfo.audiotype = atMP3; + m_sourceinfo.audiotype = atMP3; else if ( (strncmp(filename, "/autofs/", 8) || strncmp(filename+strlen(filename)-13, "/track-", 7) || strcasecmp(ext, ".wav")) == 0 ) - sourceinfo.containertype = ctCDA; + m_sourceinfo.containertype = ctCDA; if ( strcasecmp(ext, ".dat") == 0 ) { - sourceinfo.containertype = ctVCD; - sourceinfo.is_video = TRUE; + m_sourceinfo.containertype = ctVCD; + m_sourceinfo.is_video = TRUE; } - if ( (strncmp(filename, "http://", 7)) == 0 || (strncmp(filename, "udp://", 6)) == 0 || (strncmp(filename, "rtp://", 6)) == 0 || (strncmp(filename, "https://", 8)) == 0 || (strncmp(filename, "mms://", 6)) == 0 || (strncmp(filename, "rtsp://", 7)) == 0 ) - sourceinfo.is_streaming = TRUE; + if ( (strncmp(filename, "http://", 7)) == 0 || (strncmp(filename, "udp://", 6)) == 0 || (strncmp(filename, "rtp://", 6)) == 0 || (strncmp(filename, "https://", 8)) == 0 || (strncmp(filename, "mms://", 6)) == 0 || (strncmp(filename, "rtsp://", 7)) == 0 || (strncmp(filename, "rtspt://", 7)) == 0 ) + m_sourceinfo.is_streaming = TRUE; gchar *uri; - if ( sourceinfo.is_streaming ) + if ( m_sourceinfo.is_streaming ) { uri = g_strdup_printf ("%s", filename); + m_streamingsrc_timeout = eTimer::create(eApp);; + CONNECT(m_streamingsrc_timeout->timeout, eServiceMP3::sourceTimeout); + + std::string config_str; + if( ePythonConfigQuery::getConfigValue("config.mediaplayer.useAlternateUserAgent", config_str) == 0 ) + { + if ( config_str == "True" ) + ePythonConfigQuery::getConfigValue("config.mediaplayer.alternateUserAgent", m_useragent); + } + if ( m_useragent.length() == 0 ) + m_useragent = "Dream Multimedia Dreambox Enigma2 Mediaplayer"; } - else if ( sourceinfo.containertype == ctCDA ) + else if ( m_sourceinfo.containertype == ctCDA ) { int i_track = atoi(filename+18); uri = g_strdup_printf ("cdda://%i", i_track); } - else if ( sourceinfo.containertype == ctVCD ) + else if ( m_sourceinfo.containertype == ctVCD ) { int fd = open(filename,O_RDONLY); char tmp[128*1024]; @@@ -336,7 -324,7 +336,7 @@@ g_object_set (G_OBJECT (m_gst_playbin), "uri", uri, NULL); - int flags = 0x47; // ( == GST_PLAY_FLAG_VIDEO | GST_PLAY_FLAG_AUDIO | GST_PLAY_FLAG_NATIVE_VIDEO | GST_PLAY_FLAG_TEXT ) + int flags = 0x47; // ( GST_PLAY_FLAG_VIDEO | GST_PLAY_FLAG_AUDIO | GST_PLAY_FLAG_NATIVE_VIDEO | GST_PLAY_FLAG_TEXT ); g_object_set (G_OBJECT (m_gst_playbin), "flags", flags, NULL); g_free(uri); @@@ -351,19 -339,13 +351,17 @@@ eDebug("eServiceMP3::sorry, can't play: missing gst-plugin-appsink"); GstElement *dvdsubdec = gst_element_factory_make("dvdsubdec", "vobsubtitle_decoder"); - if ( !dvdsubdec ) - eDebug("eServiceMP3::sorry, can't play: missing gst-plugin-dvdsub"); - - gst_bin_add_many(GST_BIN(m_gst_subtitlebin), dvdsubdec, appsink, NULL); - -// GstPad *ghostpad = gst_ghost_pad_new("sink", gst_element_get_static_pad (appsink, "sink")); + if ( dvdsubdec ) + { + gst_bin_add_many(GST_BIN(m_gst_subtitlebin), dvdsubdec, appsink, NULL); + g_object_set (G_OBJECT (dvdsubdec), "singlebuffer", TRUE, NULL); + } + else + { + eDebug("eServiceMP3::missing gst-plugin-dvdsub, no vob subtitle support!"); + gst_bin_add(GST_BIN(m_gst_subtitlebin), appsink); + } - // GstPad *ghostpad = gst_ghost_pad_new("sink", gst_element_get_static_pad (appsink, "sink")); - GstPadTemplate *templ; templ = gst_static_pad_template_get (&subsinktemplate); @@@ -374,11 -356,11 +372,6 @@@ g_object_set (G_OBJECT (appsink), "caps", caps, NULL); gst_caps_unref(caps); --// GstCaps* caps2 = gst_caps_from_string("text/plain; text/x-pango-markup; video/x-dvd-subpicture"); --// int ret = gst_pad_set_caps (ghostpad, caps2); --// gst_caps_unref(caps2); -- - - g_object_set (G_OBJECT (dvdsubdec), "singlebuffer", TRUE, NULL); g_object_set (G_OBJECT (appsink), "async", FALSE, NULL); g_object_set (G_OBJECT (appsink), "sync", TRUE, NULL); g_object_set (G_OBJECT (appsink), "emit-signals", TRUE, NULL); @@@ -395,6 -377,8 +388,6 @@@ gst_pad_set_event_function (ghostpad, GST_DEBUG_FUNCPTR(gstGhostpadSinkEvent)); gst_pad_set_chain_function (ghostpad, GST_DEBUG_FUNCPTR(gstGhostpadChainFunction)); m_gst_prev_subtitle_caps = gst_caps_new_empty(); - - eDebug("eServiceMP3::construct dvdsubdec=%p, appsink=%p, ghostpad=%p", dvdsubdec, appsink, ghostpad); g_object_set (G_OBJECT (m_gst_playbin), "text-sink", m_gst_subtitlebin, NULL); m_subs_to_pull_handler_id = g_signal_connect (appsink, "new-buffer", G_CALLBACK (gstCBsubtitleAvail), this); @@@ -414,10 -398,6 +407,10 @@@ subs.language_code = std::string("und"); m_subtitleStreams.push_back(subs); } + if ( m_sourceinfo.is_streaming ) + { + g_signal_connect (G_OBJECT (m_gst_playbin), "notify::source", G_CALLBACK (gstHTTPSourceSetAgent), this); + } } else { m_event((iPlayableService*)this, evUser+12); @@@ -487,12 -467,6 +480,12 @@@ RESULT eServiceMP3::start( return 0; } +void eServiceMP3::sourceTimeout() +{ + eDebug("eServiceMP3::http source timeout! issuing eof..."); + m_event((iPlayableService*)this, evEOF); +} + RESULT eServiceMP3::stop() { ASSERT(m_state != stIdle); @@@ -500,7 -474,7 +493,7 @@@ if (m_state == stStopped) return -1; - GST_DEBUG_BIN_TO_DOT_FILE(GST_BIN(m_gst_playbin),GST_DEBUG_GRAPH_SHOW_ALL,"e2-playbin"); + //GST_DEBUG_BIN_TO_DOT_FILE(GST_BIN(m_gst_playbin),GST_DEBUG_GRAPH_SHOW_ALL,"e2-playbin"); eDebug("eServiceMP3::stop %s", m_ref.path.c_str()); gst_element_set_state(m_gst_playbin, GST_STATE_NULL); @@@ -1222,7 -1196,7 +1215,7 @@@ void eServiceMP3::gstBusCall(GstBus *bu source = GST_MESSAGE_SRC(msg); sourceName = gst_object_get_name(source); - #if 0 + #if 1 if (gst_message_get_structure(msg)) { gchar *string = gst_structure_to_string(gst_message_get_structure(msg)); @@@ -1274,8 -1248,6 +1267,8 @@@ } break; case GST_STATE_CHANGE_PAUSED_TO_PLAYING: { + if ( m_sourceinfo.is_streaming && m_streamingsrc_timeout ) + m_streamingsrc_timeout->stop(); } break; case GST_STATE_CHANGE_PLAYING_TO_PAUSED: { @@@ -1385,7 -1357,6 +1378,6 @@@ continue; GstStructure* str = gst_caps_get_structure(caps, 0); const gchar *g_type = gst_structure_get_name(str); - eDebug("AUDIO STRUCT=%s", g_type); audio.type = gstCheckAudioPad(str); g_codec = g_strdup(g_type); g_lang = g_strdup_printf ("und"); @@@ -1432,7 -1403,6 +1424,7 @@@ g_free (g_lang); } m_event((iPlayableService*)this, evUpdatedEventInfo); + break; } case GST_MESSAGE_ELEMENT: { @@@ -1481,37 -1451,6 +1473,37 @@@ gst_message_parse_buffering(msg, &(m_bufferInfo.bufferPercent)); gst_message_parse_buffering_stats(msg, &mode, &(m_bufferInfo.avgInRate), &(m_bufferInfo.avgOutRate), &(m_bufferInfo.bufferingLeft)); m_event((iPlayableService*)this, evBuffering); + break; + } + case GST_MESSAGE_STREAM_STATUS: + { + GstStreamStatusType type; + GstElement *owner; + gst_message_parse_stream_status (msg, &type, &owner); + if ( type == GST_STREAM_STATUS_TYPE_CREATE && m_sourceinfo.is_streaming ) + { + if ( GST_IS_PAD(source) ) + owner = gst_pad_get_parent_element(GST_PAD(source)); + else if ( GST_IS_ELEMENT(source) ) + owner = GST_ELEMENT(source); + else + owner = 0; + if ( owner ) + { + GstElementFactory *factory = gst_element_get_factory(GST_ELEMENT(owner)); + const gchar *name = gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(factory)); + if (!strcmp(name, "souphttpsrc")) + { + m_streamingsrc_timeout->start(HTTP_TIMEOUT*1000, true); + g_object_set (G_OBJECT (owner), "timeout", HTTP_TIMEOUT, NULL); + eDebug("eServiceMP3::GST_STREAM_STATUS_TYPE_CREATE -> setting timeout on %s to %is", name, HTTP_TIMEOUT); + } + + } + if ( GST_IS_PAD(source) ) + gst_object_unref(owner); + } + break; } default: break; @@@ -1527,15 -1466,6 +1519,15 @@@ GstBusSyncReply eServiceMP3::gstBusSync return GST_BUS_PASS; } +void eServiceMP3::gstHTTPSourceSetAgent(GObject *object, GParamSpec *unused, gpointer user_data) +{ + eServiceMP3 *_this = (eServiceMP3*)user_data; + GstElement *source; + g_object_get(_this->m_gst_playbin, "source", &source, NULL); + g_object_set (G_OBJECT (source), "user-agent", _this->m_useragent.c_str(), NULL); + gst_object_unref(source); +} + audiotype_t eServiceMP3::gstCheckAudioPad(GstStructure* structure) { if (!structure) @@@ -1712,7 -1642,7 +1704,7 @@@ out GstCaps* eServiceMP3::gstGhostpadGetCAPS(GstPad * pad) { - eDebug("eServiceMP3::gstGhostpadGetCAPS"); +// eDebug("eServiceMP3::gstGhostpadGetCAPS"); return gst_static_pad_template_get_caps(&subsinktemplate); } @@@ -1721,7 -1651,7 +1713,7 @@@ gboolean eServiceMP3::gstGhostpadAccept GstCaps *templ_caps = gst_static_pad_template_get_caps (&subsinktemplate); gboolean ret = gst_caps_can_intersect (templ_caps, caps); - eDebug("gstGhostpadAcceptCAPS templ=%s, given=%s ret=%i", gst_caps_to_string(templ_caps), gst_caps_to_string(caps), ret); +// eDebug("gstGhostpadAcceptCAPS templ=%s, given=%s ret=%i", gst_caps_to_string(templ_caps), gst_caps_to_string(caps), ret); gst_caps_unref (templ_caps); return ret; @@@ -1746,16 -1676,16 +1738,16 @@@ void eServiceMP3::gstGhostpadLink(gpoin gst_element_unlink(dvdsubdec, appsink); int ret = -1; - if (gst_structure_has_name (s, "video/x-dvd-subpicture")) + if ( gst_structure_has_name (s, "video/x-dvd-subpicture") && dvdsubdec ) { sinkpad = gst_element_get_static_pad (dvdsubdec, "sink"); ret = gst_element_link_pads (dvdsubdec, "src", appsink, "sink"); - eDebug("gstGhostpadLink:: dvdsubdec+appsink = %i", ret); +// eDebug("gstGhostpadLink:: dvdsubdec+appsink = %i", ret); } else { sinkpad = gst_element_get_static_pad (appsink, "sink"); - eDebug("gstGhostpadLink:: appsink"); +// eDebug("gstGhostpadLink:: appsink"); } gst_ghost_pad_set_target (GST_GHOST_PAD(ghostpad), sinkpad); @@@ -1765,7 -1695,7 +1757,7 @@@ GstFlowReturn eServiceMP3::gstGhostpadB { eServiceMP3 *_this = g_object_get_data (G_OBJECT (pad), "application-instance"); - eDebug("eServiceMP3::gstGhostpadBufferAlloc prevcaps=%s newcaps=%s", gst_caps_to_string(_this->m_gst_prev_subtitle_caps), gst_caps_to_string(caps)); +// eDebug("eServiceMP3::gstGhostpadBufferAlloc prevcaps=%s newcaps=%s", gst_caps_to_string(_this->m_gst_prev_subtitle_caps), gst_caps_to_string(caps)); if (!GST_PAD_CAPS (pad) || !gst_caps_is_equal (_this->m_gst_prev_subtitle_caps, caps)) gstGhostpadLink (_this, caps); @@@ -1778,7 -1708,7 +1770,7 @@@ void eServiceMP3::gstGhostpadHasCAPS(Gs eServiceMP3 *_this = (eServiceMP3*)user_data; g_object_get (G_OBJECT (pad), "caps", &caps, NULL); - eDebug("gstGhostpadHasCAPS:: signal::caps = %s", gst_caps_to_string(caps)); +// eDebug("gstGhostpadHasCAPS:: signal::caps = %s", gst_caps_to_string(caps)); if (!caps) return; @@@ -1788,7 -1718,7 +1780,7 @@@ if ( subs.type == stUnknown ) { GstTagList *tags; - eDebug("gstGhostpadHasCAPS::m_subtitleStreams[%i].type == stUnknown...", _this->m_currentSubtitleStream); +// eDebug("gstGhostpadHasCAPS::m_subtitleStreams[%i].type == stUnknown...", _this->m_currentSubtitleStream); gchar *g_lang; g_signal_emit_by_name (_this->m_gst_playbin, "get-text-tags", _this->m_currentSubtitleStream, &tags); @@@ -1805,7 -1735,7 +1797,7 @@@ g_free (g_lang); } - eDebug("gstGhostpadHasCAPS:: _this->m_gst_prev_subtitle_caps=%s equal=%i",gst_caps_to_string(_this->m_gst_prev_subtitle_caps),gst_caps_is_equal(_this->m_gst_prev_subtitle_caps, caps)); +// eDebug("gstGhostpadHasCAPS:: _this->m_gst_prev_subtitle_caps=%s equal=%i",gst_caps_to_string(_this->m_gst_prev_subtitle_caps),gst_caps_is_equal(_this->m_gst_prev_subtitle_caps, caps)); if (!GST_PAD_CAPS (pad) || !gst_caps_is_equal (_this->m_gst_prev_subtitle_caps, caps)) gstGhostpadLink(_this, caps); @@@ -1827,10 -1757,11 +1819,10 @@@ GstFlowReturn eServiceMP3::gstGhostpadC unsigned char line[len+1]; memcpy(line, GST_BUFFER_DATA(buffer), len); line[len] = 0; - eDebug("gstGhostpadChainFunction buffer: '%s' caps: %s ", line, gst_caps_to_string(GST_BUFFER_CAPS(buffer))); +// eDebug("gstGhostpadChainFunction buffer: '%s' caps: %s ", line, gst_caps_to_string(GST_BUFFER_CAPS(buffer))); ret = _this->m_ghost_pad_chain_function(pad, buffer); - eDebug("original chain func returns %i", ret); -// eDebug("original chain func not called. returning %i", ret); +// eDebug("original chain func returns %i", ret); return ret; } @@@ -1997,34 -1928,39 +1989,34 @@@ void eServiceMP3::pushSubtitles( { SubtitlePage frontpage = m_subtitle_pages.front(); gint64 diff_ms = 0; + gint64 show_pts = 0; getPlayPosition(running_pts); if ( frontpage.pango_page != 0 ) - { - diff_ms = ( frontpage.pango_page->show_pts - running_pts ) / 90; - eDebug("eServiceMP3::pushSubtitles TEXT show_pts = %lld running_pts = %lld diff = %lld", frontpage.pango_page->show_pts, running_pts, diff_ms); - } - - if ( frontpage.vob_page != 0 ) - { - diff_ms = ( frontpage.vob_page->show_pts - running_pts ) / 90; - eDebug("eServiceMP3::pushSubtitles VOB show_pts = %lld running_pts = %lld diff = %lld", frontpage.vob_page->show_pts, running_pts, diff_ms); - } + show_pts = frontpage.pango_page->show_pts; + else if ( frontpage.vob_page != 0 ) + show_pts = frontpage.vob_page->show_pts; - if ( diff_ms < -9000 ) + diff_ms = ( show_pts - running_pts ) / 90; + GstFormat fmt = GST_FORMAT_TIME; + gint64 now; + if ( gst_element_query_position(m_gst_playbin, &fmt, &now) != -1 ) + eDebug("check decoder/pipeline diff: decoder: %lld, pipeline: %lld, show_pts: %lld, diff: %lld ms", running_pts/90, now/1000000, show_pts/90, diff_ms); + else + eDebug("query position for decoder/pipeline check failed!"); + + if ( diff_ms < -100 ) { - GstFormat fmt = GST_FORMAT_TIME; - gint64 now; - if ( gst_element_query_position(m_gst_playbin, &fmt, &now) != -1 ) + now /= 11111; + diff_ms = abs((now - running_pts) / 90); + + if (diff_ms > 100000) { - now /= 11111; - diff_ms = abs((now - running_pts) / 90); - eDebug("diff < -100ms check decoder/pipeline diff: decoder: %lld, pipeline: %lld, diff: %lld", running_pts, now, diff_ms); - if (diff_ms > 100000) - { - eDebug("high decoder/pipeline difference.. assume decoder has now started yet.. check again in 1sec"); - m_subtitle_sync_timer->start(1000, true); - break; - } + eDebug("high decoder/pipeline difference.. assume decoder has now started yet.. check again in 1sec"); + m_subtitle_sync_timer->start(1000, true); + break; } - else - eDebug("query position for decoder/pipeline check failed!"); eDebug("subtitle too late... drop"); m_subtitle_pages.pop_front(); } @@@ -2040,7 -1976,7 +2032,6 @@@ { if ( frontpage.pango_page != 0) { - // eDebug("immediate show pango subtitle line"); - eDebug("immediate show pango subtitle line"); m_subtitle_widget->setPage(*(frontpage.pango_page)); } else if ( frontpage.vob_page != 0) @@@ -2060,14 -1996,14 +2051,14 @@@ void eServiceMP3::hideSubtitles() { - eDebug("eServiceMP3::hideSubtitles()"); +// eDebug("eServiceMP3::hideSubtitles()"); if ( m_subtitle_widget ) m_subtitle_widget->hide(); } RESULT eServiceMP3::enableSubtitles(eWidget *parent, ePyObject tuple) { - eDebug ("eServiceMP3::enableSubtitles m_currentSubtitleStream=%i this=%p",m_currentSubtitleStream, this); +// eDebug ("eServiceMP3::enableSubtitles m_currentSubtitleStream=%i this=%p",m_currentSubtitleStream, this); ePyObject entry; int tuplesize = PyTuple_Size(tuple); int pid, type; @@@ -2092,11 -2028,11 +2083,11 @@@ goto error_out; type = PyInt_AsLong(entry); - eDebug ("eServiceMP3::enableSubtitles new pid=%i",pid); +// eDebug ("eServiceMP3::enableSubtitles new pid=%i",pid); if (m_currentSubtitleStream != pid) { g_object_set (G_OBJECT (m_gst_playbin), "current-text", pid, NULL); - eDebug ("eServiceMP3::enableSubtitles g_object_set current-text = %i", pid); +// eDebug ("eServiceMP3::enableSubtitles g_object_set current-text = %i", pid); m_currentSubtitleStream = pid; m_subs_to_pull = 0; m_subtitle_pages.clear(); @@@ -2138,7 -2074,7 +2129,7 @@@ PyObject *eServiceMP3::getCachedSubtitl PyObject *eServiceMP3::getSubtitleList() { - eDebug("eServiceMP3::getSubtitleList"); +// eDebug("eServiceMP3::getSubtitleList"); ePyObject l = PyList_New(0); int stream_idx = 0; @@@ -2146,7 -2082,7 +2137,7 @@@ { subtype_t type = IterSubtitleStream->type; ePyObject tuple = PyTuple_New(5); - eDebug("eServiceMP3::getSubtitleList idx=%i type=%i, code=%s", stream_idx, int(type), (IterSubtitleStream->language_code).c_str()); +// eDebug("eServiceMP3::getSubtitleList idx=%i type=%i, code=%s", stream_idx, int(type), (IterSubtitleStream->language_code).c_str()); PyTuple_SET_ITEM(tuple, 0, PyInt_FromLong(2)); PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong(stream_idx)); PyTuple_SET_ITEM(tuple, 2, PyInt_FromLong(int(type))); @@@ -2156,6 -2092,7 +2147,7 @@@ Py_DECREF(tuple); stream_idx++; } + eDebug("eServiceMP3::getSubtitleList finished"); return l; }