summaryrefslogtreecommitdiff
path: root/core/multimedia/opieplayer/libmpeg3
authorllornkcor <llornkcor>2002-02-25 01:35:47 (UTC)
committer llornkcor <llornkcor>2002-02-25 01:35:47 (UTC)
commitf180c1a5e8fc889ff1fb390d5cc94cdbc5085046 (patch) (side-by-side diff)
tree5e9ea6f1313f4c33d57fb266523c1cfbe0826756 /core/multimedia/opieplayer/libmpeg3
parentc0446b55fc32b7fdea9f58db06e40da703f5e8ff (diff)
downloadopie-f180c1a5e8fc889ff1fb390d5cc94cdbc5085046.zip
opie-f180c1a5e8fc889ff1fb390d5cc94cdbc5085046.tar.gz
opie-f180c1a5e8fc889ff1fb390d5cc94cdbc5085046.tar.bz2
fucked up- no workie.. back out
Diffstat (limited to 'core/multimedia/opieplayer/libmpeg3') (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/libmpeg3/Makefile.in6
-rw-r--r--core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h5
-rw-r--r--core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h4
3 files changed, 4 insertions, 11 deletions
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index d255e4f..154f85d 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -178,4 +178,3 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \
video/mpeg3video.h \
- mpeg3protos.h \
- ../mediaplayerplugininterface.h
+ mpeg3protos.h
@@ -195,3 +194,2 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
mpeg3protos.h \
- ../mediaplayerplugininterface.h \
libmpeg3pluginimpl.h
@@ -418,3 +416,3 @@ audio/layer2.o: audio/layer2.c \
audio/layer3.o: audio/layer3.c \
- huffman.h \
+ audio/huffman.h \
audio/mpeg3audio.h \
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h
index 54f259b..e0eb930 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h
@@ -22,3 +22,2 @@
-
#include <qstring.h>
@@ -27,4 +26,3 @@
#include "mpeg3protos.h"
-//#include <qpe/mediaplayerplugininterface.h>
-#include "../mediaplayerplugininterface.h"
+#include <qpe/mediaplayerplugininterface.h>
@@ -54,3 +52,2 @@ public:
int audioFrequency( int stream ) { return file ? mpeg3_sample_rate( file, stream ) : 0; }
- int audioBitsPerSample(int) { return 0;}
int audioSamples( int stream ) { return file ? mpeg3_audio_samples( file, stream ) : 0; }
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h
index 89abf97..e9926f4 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h
@@ -22,5 +22,3 @@
-
-//#include <qpe/mediaplayerplugininterface.h>
-#include "../mediaplayerplugininterface.h"
+#include <qpe/mediaplayerplugininterface.h>