picexif: fix buffer overflow

[enigma2.git] / lib / service / servicemp3.cpp

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 81dab9357b2dfe79699666398d812659a002d463..e453a2b3c896a6cef1be80a9236d7d08386de658 100644 (file)
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -1,5 +1,3 @@
-#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>
@@ -289,6 +287,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 +298,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 +359,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);
                }
@@ -1792,6 +1789,3 @@ void eServiceMP3::setPCMDelay(int delay)
        }
 }
 
-#else
-#warning gstreamer not available, not building media player
-#endif