| author | kergoth <kergoth> | 2003-08-09 18:00:34 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2003-08-09 18:00:34 (UTC) |
| commit | 7670c56f5952f7772e8fbab65e9233274e2a0564 (patch) (side-by-side diff) | |
| 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 @@ config LIBTREMORPLUGIN - boolean "opieplayer1-libtremorplugin (play OGG vorbis files)" + boolean "libtremorplugin" default "y" depends ( LIBQPE || LIBQPE-X11 ) && OPIEPLAYER + comment "tremor is ogg vorbis!!"
\ 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 @@ -40,5 +40,4 @@ extern "C" { -#include "tremor/ivorbiscodec.h" #include "tremor/ivorbisfile.h" } 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 @@ config LIBTREMOR - boolean "libtremor (library needed to play OGG files)" + boolean "libtremor" default "y" 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,5 +1,5 @@ TEMPLATE = lib CONFIG += qt warn_on release -HEADERS = libtremorplugin.h libtremorinimpl.h +HEADERS = libtremorplugin.h libtremorpluginimpl.h SOURCES = libtremorplugin.cpp libtremorpluginimpl.cpp TARGET = tremorplugin |