author | kergoth <kergoth> | 2003-08-09 18:00:34 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 18:00:34 (UTC) |
commit | 7670c56f5952f7772e8fbab65e9233274e2a0564 (patch) (unidiff) | |
tree | 10932f8976c76755b8edf2ab9397a6e53d95a13c /core/multimedia/opieplayer/vorbis | |
parent | 1ab4ca95e4d2cf24d32b38c9031cb6076351e730 (diff) | |
download | opie-7670c56f5952f7772e8fbab65e9233274e2a0564.zip opie-7670c56f5952f7772e8fbab65e9233274e2a0564.tar.gz opie-7670c56f5952f7772e8fbab65e9233274e2a0564.tar.bz2 |
Merge from BRANCH_1_0
Diffstat (limited to 'core/multimedia/opieplayer/vorbis') (more/less context) (ignore 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 | |||
@@ -38,9 +38,8 @@ | |||
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 | ||
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,7 +1,7 @@ | |||
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 |