assume HAVE_GSTREAMER is always set

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 1fb1e443ac45f3083082ee70b3a75c7bb4721d1a..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>
        /* 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>


@@ -1791,6 +1789,3 @@ void eServiceMP3::setPCMDelay(int delay)
        }
 }
 
        }
 }
 

-#else
-#warning gstreamer not available, not building media player
-#endif

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index 01f7cf7f2efd6fa63aa15da1383089ad51f24b97..b864a1004d2785d6d08aaa17afb5eee3f4d5113d 100644 (file)
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -1,7 +1,6 @@
 #ifndef __servicemp3_h
 #define __servicemp3_h
 
 #ifndef __servicemp3_h
 #define __servicemp3_h
 

-#ifdef HAVE_GSTREAMER

 #include <lib/base/message.h>
 #include <lib/service/iservice.h>
 #include <lib/dvb/pmt.h>
 #include <lib/base/message.h>
 #include <lib/service/iservice.h>
 #include <lib/dvb/pmt.h>


@@ -228,6 +227,5 @@ private:
        std::string m_useragent;
        RESULT trickSeek(gdouble ratio);
 };
        std::string m_useragent;
        RESULT trickSeek(gdouble ratio);
 };

-#endif

 
 #endif
 
 #endif

diff --git a/main/enigma.cpp b/main/enigma.cpp
index b8554d582c1b72f6788002509a36ae3c6a4f698d..b3364679e98e3029da1e97d4797222b3bd0f5753 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -31,9 +31,7 @@
 
 #include "bsod.h"
 
 
 #include "bsod.h"
 

-#ifdef HAVE_GSTREAMER

 #include <gst/gst.h>
 #include <gst/gst.h>

-#endif

 
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
 
 #ifdef OBJECT_DEBUG
 int object_total_remaining;


@@ -135,9 +133,7 @@ int main(int argc, char **argv)
        atexit(object_dump);
 #endif
 
        atexit(object_dump);
 #endif
 

-#ifdef HAVE_GSTREAMER

        gst_init(&argc, &argv);
        gst_init(&argc, &argv);

-#endif

 
        // set pythonpath if unset
        setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0);
 
        // set pythonpath if unset
        setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0);