Diffstat (limited to 'core/multimedia/opieplayer/vorbis') (more/less context) (show whitespace changes)
4 files changed, 4 insertions, 4 deletions
diff --git a/core/multimedia/opieplayer/vorbis/config.in b/core/multimedia/opieplayer/vorbis/config.in index bad9922..d66ec88 100644 --- a/core/multimedia/opieplayer/vorbis/config.in +++ b/core/multimedia/opieplayer/vorbis/config.in | |||
@@ -1,5 +1,6 @@ | |||
1 | config LIBTREMORPLUGIN | 1 | config LIBTREMORPLUGIN |
2 | boolean "opieplayer1-libtremorplugin (play OGG vorbis files)" | 2 | boolean "libtremorplugin" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && OPIEPLAYER | 4 | depends ( LIBQPE || LIBQPE-X11 ) && OPIEPLAYER |
5 | comment "tremor is ogg vorbis!!" | ||
5 | \ No newline at end of file | 6 | \ No newline at end of file |
diff --git a/core/multimedia/opieplayer/vorbis/libtremorplugin.cpp b/core/multimedia/opieplayer/vorbis/libtremorplugin.cpp index c1e1a23..53c4b2b 100644 --- a/core/multimedia/opieplayer/vorbis/libtremorplugin.cpp +++ b/core/multimedia/opieplayer/vorbis/libtremorplugin.cpp | |||
@@ -30,25 +30,24 @@ | |||
30 | #include <errno.h> | 30 | #include <errno.h> |
31 | #include <time.h> | 31 | #include <time.h> |
32 | #include <locale.h> | 32 | #include <locale.h> |
33 | #include <math.h> | 33 | #include <math.h> |
34 | #include <assert.h> | 34 | #include <assert.h> |
35 | 35 | ||
36 | #include <qmap.h> | 36 | #include <qmap.h> |
37 | 37 | ||
38 | #include "libtremorplugin.h" | 38 | #include "libtremorplugin.h" |
39 | 39 | ||
40 | 40 | ||
41 | extern "C" { | 41 | extern "C" { |
42 | #include "tremor/ivorbiscodec.h" | ||
43 | #include "tremor/ivorbisfile.h" | 42 | #include "tremor/ivorbisfile.h" |
44 | } | 43 | } |
45 | 44 | ||
46 | 45 | ||
47 | #define MPEG_BUFFER_SIZE 65536 | 46 | #define MPEG_BUFFER_SIZE 65536 |
48 | //#define debugMsg(a) qDebug(a) | 47 | //#define debugMsg(a) qDebug(a) |
49 | #define debugMsg(a) | 48 | #define debugMsg(a) |
50 | 49 | ||
51 | 50 | ||
52 | class LibTremorPluginData { | 51 | class LibTremorPluginData { |
53 | public: | 52 | public: |
54 | char* filename; | 53 | char* filename; |
diff --git a/core/multimedia/opieplayer/vorbis/tremor/config.in b/core/multimedia/opieplayer/vorbis/tremor/config.in index 8ee753c..f803d16 100644 --- a/core/multimedia/opieplayer/vorbis/tremor/config.in +++ b/core/multimedia/opieplayer/vorbis/tremor/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config LIBTREMOR | 1 | config LIBTREMOR |
2 | boolean "libtremor (library needed to play OGG files)" | 2 | boolean "libtremor" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && OPIEPLAYER | 4 | depends ( LIBQPE || LIBQPE-X11 ) && OPIEPLAYER |
diff --git a/core/multimedia/opieplayer/vorbis/vorbis.pro b/core/multimedia/opieplayer/vorbis/vorbis.pro index a15cf9c..d566003 100644 --- a/core/multimedia/opieplayer/vorbis/vorbis.pro +++ b/core/multimedia/opieplayer/vorbis/vorbis.pro | |||
@@ -1,11 +1,11 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS = libtremorplugin.h libtremorinimpl.h | 3 | HEADERS = libtremorplugin.h libtremorpluginimpl.h |
4 | SOURCES = libtremorplugin.cpp libtremorpluginimpl.cpp | 4 | SOURCES = libtremorplugin.cpp libtremorpluginimpl.cpp |
5 | TARGET = tremorplugin | 5 | TARGET = tremorplugin |
6 | DESTDIR = $(OPIEDIR)/plugins/codecs | 6 | DESTDIR = $(OPIEDIR)/plugins/codecs |
7 | INCLUDEPATH += $(OPIEDIR)/include .. tremor | 7 | INCLUDEPATH += $(OPIEDIR)/include .. tremor |
8 | DEPENDPATH += $(OPIEDIR)/include .. tremor | 8 | DEPENDPATH += $(OPIEDIR)/include .. tremor |
9 | LIBS += -lqpe -lm -ltremor | 9 | LIBS += -lqpe -lm -ltremor |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | include ( $(OPIEDIR)/include.pro ) | 11 | include ( $(OPIEDIR)/include.pro ) |