diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-06 22:37:10 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-06 22:37:10 +0200 |
| commit | cdb4e68027ec99a49805d8ab5e84d644f5ec2ff1 (patch) | |
| tree | baecb95ded4ba66e8b4599700d166bdfa004cb4f /lib | |
| parent | e4dc3ba0e1ca66ed5fa7aab8d55e8518d1610aa2 (diff) | |
| download | enigma2-cdb4e68027ec99a49805d8ab5e84d644f5ec2ff1.tar.gz enigma2-cdb4e68027ec99a49805d8ab5e84d644f5ec2ff1.zip | |
merge changes between experimental and master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/service/servicemp3.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index 81dab935..1fb1e443 100644 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -289,6 +289,8 @@ eServiceMP3::eServiceMP3(eServiceReference ref) 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 ) @@ -298,9 +300,6 @@ eServiceMP3::eServiceMP3(eServiceReference ref) } if ( m_useragent.length() == 0 ) m_useragent = "Dream Multimedia Dreambox Enigma2 Mediaplayer"; - - m_streamingsrc_timeout = eTimer::create(eApp);; - CONNECT(m_streamingsrc_timeout->timeout, eServiceMP3::sourceTimeout); } else if ( m_sourceinfo.containertype == ctCDA ) { @@ -362,7 +361,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref) subs.language_code = std::string("und"); m_subtitleStreams.push_back(subs); } - if ( sourceinfo.is_streaming ) + if ( m_sourceinfo.is_streaming ) { g_signal_connect (G_OBJECT (m_gst_playbin), "notify::source", G_CALLBACK (gstHTTPSourceSetAgent), this); } |