git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
675f9d0
)
merge fix
author
Fraxinas
<andreas.frisch@multimedia-labs.de>
Tue, 20 Jul 2010 08:11:35 +0000
(10:11 +0200)
committer
Fraxinas
<andreas.frisch@multimedia-labs.de>
Tue, 20 Jul 2010 08:11:35 +0000
(10:11 +0200)
lib/service/servicemp3.cpp
patch
|
blob
|
history
diff --git
a/lib/service/servicemp3.cpp
b/lib/service/servicemp3.cpp
index b50b52d02cb9d2175b49f66df38bf4d7ace5f759..dec87a9a5ad8f4c4944a3e807f68f7edc41253a1 100644
(file)
--- 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);
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);
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 )
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";
}
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 )
{
}
else if ( m_sourceinfo.containertype == ctCDA )
{