diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-10-22 17:16:23 +0000 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-11-16 17:09:12 +0100 |
| commit | 30f902c06a7bd3c726aeb08a5424d6a59871615f (patch) | |
| tree | 002e727c709f142af96297d71ee1b5cee5579edd | |
| parent | 9d1fc7ccabd9bad90d3138558d139f1cb8f6ef03 (diff) | |
| download | enigma2-30f902c06a7bd3c726aeb08a5424d6a59871615f.tar.gz enigma2-30f902c06a7bd3c726aeb08a5424d6a59871615f.zip | |
assume HAVE_GSTREAMER is always set
| -rw-r--r-- | lib/service/servicemp3.cpp | 5 | ||||
| -rw-r--r-- | lib/service/servicemp3.h | 2 | ||||
| -rw-r--r-- | main/enigma.cpp | 4 |
3 files changed, 0 insertions, 11 deletions
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index 1fb1e443..e453a2b3 100644 --- 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> @@ -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 01f7cf7f..b864a100 100644 --- a/lib/service/servicemp3.h +++ b/lib/service/servicemp3.h @@ -1,7 +1,6 @@ #ifndef __servicemp3_h #define __servicemp3_h -#ifdef HAVE_GSTREAMER #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); }; -#endif #endif diff --git a/main/enigma.cpp b/main/enigma.cpp index b8554d58..b3364679 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -31,9 +31,7 @@ #include "bsod.h" -#ifdef HAVE_GSTREAMER #include <gst/gst.h> -#endif #ifdef OBJECT_DEBUG int object_total_remaining; @@ -135,9 +133,7 @@ int main(int argc, char **argv) atexit(object_dump); #endif -#ifdef HAVE_GSTREAMER gst_init(&argc, &argv); -#endif // set pythonpath if unset setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0); |