fixed 2

4 files changed, 10 insertions, 4 deletions

diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 154f85d..d255e4f 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -178,3 +178,4 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \
                 video/mpeg3video.h \
-                mpeg3protos.h
+                mpeg3protos.h \
+                ../mediaplayerplugininterface.h
 
@@ -194,2 +195,3 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
                 mpeg3protos.h \
+                ../mediaplayerplugininterface.h \
                 libmpeg3pluginimpl.h
@@ -416,3 +418,3 @@ audio/layer2.o: audio/layer2.c \
 audio/layer3.o: audio/layer3.c \
-                audio/huffman.h \
+                huffman.h \
                 audio/mpeg3audio.h \
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
index b1426d1..e50aa4e 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
@@ -37,2 +37,3 @@ SOURCES		=   libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
         TARGET  =   mpeg3plugin
+TMAKE_CC=g++
         DESTDIR         =   ../../plugins/codecs
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h
index e0eb930..bd31706 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h
@@ -26,3 +26,4 @@
 #include "mpeg3protos.h"
-#include <qpe/mediaplayerplugininterface.h>
+//#include <qpe/mediaplayerplugininterface.h>
+#include "../mediaplayerplugininterface.h"
 
@@ -52,2 +53,3 @@ 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 e9926f4..a2f5211 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h
@@ -22,3 +22,4 @@
 
-#include <qpe/mediaplayerplugininterface.h>
+//#include <qpe/mediaplayerplugininterface.h>
+#include "../mediaplayerplugininterface.h"