fixed 2

4 files changed, 49 insertions, 43 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
@@ -176,7 +176,8 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \
 		audio/mpeg3audio.h \
 		mpeg3vtrack.h \
 		video/mpeg3video.h \
-		mpeg3protos.h
+		mpeg3protos.h \
+		../mediaplayerplugininterface.h
 
 libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
 		libmpeg3plugin.h \
@@ -192,6 +193,7 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
 		mpeg3vtrack.h \
 		video/mpeg3video.h \
 		mpeg3protos.h \
+		../mediaplayerplugininterface.h \
 		libmpeg3pluginimpl.h
 
 bitstream.o: bitstream.c \
@@ -414,7 +416,7 @@ audio/layer2.o: audio/layer2.c \
 		audio/tables.h
 
 audio/layer3.o: audio/layer3.c \
-		audio/huffman.h \
+		huffman.h \
 		audio/mpeg3audio.h \
 		audio/ac3.h \
 		audio/mpeg3real.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
@@ -1,42 +1,43 @@
-TEMPLATE	=   lib
-CONFIG		+=  qt warn_on release
-HEADERS		=   libmpeg3plugin.h   libmpeg3pluginimpl.h
-SOURCES		=   libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
-		    bitstream.c \
-		    libmpeg3.c \
-		    mpeg3atrack.c \
-		    mpeg3css.c \
-		    mpeg3demux.c \
-		    mpeg3io.c \
-		    mpeg3title.c \
-		    mpeg3vtrack.c \
-		    audio/ac3.c \
-		    audio/bit_allocation.c \
-		    audio/dct.c \
-		    audio/exponents.c \
-		    audio/header.c \
-		    audio/layer2.c \
-		    audio/layer3.c \
-		    audio/mantissa.c \
-		    audio/mpeg3audio.c \
-		    audio/pcm.c \
-		    audio/synthesizers.c \
-		    audio/tables.c \
-		    video/getpicture.c \
-		    video/headers.c \
-		    video/idct.c \
-		    video/macroblocks.c \
-		    video/mmxtest.c \
-		    video/motion.c \
-		    video/mpeg3video.c \
-		    video/output.c \
-		    video/reconstruct.c \
-		    video/seek.c \
-		    video/slice.c \
-		    video/vlc.c
-TARGET		=   mpeg3plugin
-DESTDIR		=   ../../plugins/codecs
+TEMPLATE  =   lib
+CONFIG    +=  qt warn_on release
+HEADERS   =   libmpeg3plugin.h   libmpeg3pluginimpl.h
+SOURCES   =   libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
+        bitstream.c \
+        libmpeg3.c \
+        mpeg3atrack.c \
+        mpeg3css.c \
+        mpeg3demux.c \
+        mpeg3io.c \
+        mpeg3title.c \
+        mpeg3vtrack.c \
+        audio/ac3.c \
+        audio/bit_allocation.c \
+        audio/dct.c \
+        audio/exponents.c \
+        audio/header.c \
+        audio/layer2.c \
+        audio/layer3.c \
+        audio/mantissa.c \
+        audio/mpeg3audio.c \
+        audio/pcm.c \
+        audio/synthesizers.c \
+        audio/tables.c \
+        video/getpicture.c \
+        video/headers.c \
+        video/idct.c \
+        video/macroblocks.c \
+        video/mmxtest.c \
+        video/motion.c \
+        video/mpeg3video.c \
+        video/output.c \
+        video/reconstruct.c \
+        video/seek.c \
+        video/slice.c \
+        video/vlc.c
+TARGET    =   mpeg3plugin
+TMAKE_CC=g++
+DESTDIR   =   ../../plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe -lpthread -lm
-VERSION		=   1.0.0
+VERSION   =   1.0.0
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
@@ -24,7 +24,8 @@
 #include <qapplication.h>
 #include "libmpeg3.h"
 #include "mpeg3protos.h"
-#include <qpe/mediaplayerplugininterface.h>
+//#include <qpe/mediaplayerplugininterface.h>
+#include "../mediaplayerplugininterface.h"
 
 
 // #define OLD_MEDIAPLAYER_API
@@ -50,6 +51,7 @@ public:
     int audioStreams() { return file ? mpeg3_total_astreams( file ) : 0; }
     int audioChannels( int stream ) { return file ? mpeg3_audio_channels( file, stream ) : 0; }
     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; } 
     bool audioSetSample( long sample, int stream ) { return file ? mpeg3_set_sample( file, sample, stream) == 1 : FALSE; }
     long audioGetSample( int stream ) { return file ? mpeg3_get_sample( 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
@@ -20,7 +20,8 @@
 #ifndef LIBMPEG3_PLUGIN_IMPL_H 
 #define LIBMPEG3_PLUGIN_IMPL_H
 
-#include <qpe/mediaplayerplugininterface.h>
+//#include <qpe/mediaplayerplugininterface.h>
+#include "../mediaplayerplugininterface.h"
 
 
 class LibMpeg3Plugin;