-#ifdef HAVE_GSTREAMER
-
/* note: this requires gstreamer 0.10.x and a big list of plugins. */
/* it's currently hardcoded to use a big-endian alsasink as sink. */
#include <lib/base/ebase.h>
extensions.push_back("mp4");
extensions.push_back("mov");
extensions.push_back("m4a");
- extensions.push_back("m2ts");
sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
}
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 )
}
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 )
{
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);
}
}
}
-#else
-#warning gstreamer not available, not building media player
-#endif