X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fservicemp3.cpp;h=1fb1e443ac45f3083082ee70b3a75c7bb4721d1a;hp=b50b52d02cb9d2175b49f66df38bf4d7ace5f759;hb=0a62b65175152c42976d4cb04fb7026d9f910915;hpb=675f9d0eeb82577252a68ee263049acc1ff80bcc

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index b50b52d..1fb1e44 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -48,7 +48,6 @@ eServiceFactoryMP3::eServiceFactoryMP3()
 		extensions.push_back("mp4");
 		extensions.push_back("mov");
 		extensions.push_back("m4a");
-		extensions.push_back("m2ts");
 		sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
 	}
 
@@ -290,10 +289,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 +300,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 )
 	{
@@ -365,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);
 		}