diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2010-07-20 10:11:35 +0200 |
|---|---|---|
| committer | Fraxinas <andreas.frisch@multimedia-labs.de> | 2010-07-20 10:11:35 +0200 |
| commit | c133a7b7ee3642dac16867449fc94b86b5d8fed5 (patch) | |
| tree | 49ea80b90db35254ef4411ad3b93718cf03ef6e5 /lib/service/servicemp3.cpp | |
| parent | 675f9d0eeb82577252a68ee263049acc1ff80bcc (diff) | |
| download | enigma2-c133a7b7ee3642dac16867449fc94b86b5d8fed5.tar.gz enigma2-c133a7b7ee3642dac16867449fc94b86b5d8fed5.zip | |
merge fix
Diffstat (limited to 'lib/service/servicemp3.cpp')
| -rw-r--r-- | lib/service/servicemp3.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index b50b52d0..dec87a9a 100644 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -290,10 +290,8 @@ eServiceMP3::eServiceMP3(eServiceReference ref) if ( m_sourceinfo.is_streaming ) { uri = g_strdup_printf ("%s", filename); -<<<<<<< HEAD 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 ) @@ -303,7 +301,6 @@ eServiceMP3::eServiceMP3(eServiceReference ref) } if ( m_useragent.length() == 0 ) m_useragent = "Dream Multimedia Dreambox Enigma2 Mediaplayer"; ->>>>>>> b08c138... implement configurable http user-agent (fixes #224) } else if ( m_sourceinfo.containertype == ctCDA ) { |