5 files changed, 30 insertions, 16 deletions
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index e9f74e7..552043c 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -216,2 +216,3 @@ libmadplugin.o: libmadplugin.cpp \
 		libmadplugin.h \
+		../mediaplayerplugininterface.h \
 		mad.h
@@ -220,2 +221,3 @@ libmadpluginimpl.o: libmadpluginimpl.cpp \
 		libmadplugin.h \
+		../mediaplayerplugininterface.h \
 		libmadpluginimpl.h
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro
index 6c40a15..b54ca6b 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -1,12 +1,14 @@
-TEMPLATE	=   lib
-CONFIG		+=  qt warn_on release
-HEADERS		=   libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \
-		    layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h
-SOURCES	        =   version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \
-		    layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp
-TARGET		=   madplugin
-DESTDIR		=   ../../plugins/codecs
+TEMPLATE  =   lib
+CONFIG    +=  qt warn_on release
+HEADERS   =   libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \
+        layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h
+SOURCES         =   version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \
+        layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp
+TARGET    =   madplugin
+DESTDIR   =   ../../plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  ../$(OPIEDIR)/include ..
+TMAKE_CFLAGS += -DFPM_64BIT
+TMAKE_CXXFLAGS += -DFPM_64BIT
 LIBS            +=  -lqpe -lm
-VERSION		=   1.0.0
+VERSION   =   1.0.0
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.h b/core/multimedia/opieplayer/libmad/libmadplugin.h
index 88647ae..ff84c27 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.h
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.h
@@ -24,3 +24,7 @@
 #include <qstring.h>
-#include "mediaplayerplugininterface.h"
+//#include <qpe/mediaplayerplugininterface.h>
+#include "../mediaplayerplugininterface.h"
+
+
+// #define OLD_MEDIAPLAYER_API
 
@@ -52,8 +56,12 @@ public:
     bool audioSetSample( long sample, int stream );
+    int audioBitsPerSample(int) {return 0;}
     long audioGetSample( int stream );
-//    bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream );
-//    bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream );
+#ifdef OLD_MEDIAPLAYER_API
+    bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream );
+    bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream );
+    bool audioReadSamples( short *output, int channel, long samples, int stream );
+    bool audioReReadSamples( short *output, int channel, long samples, int stream );
+#else
     bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream );
-//    bool audioReadSamples( short *output, int channel, long samples, int stream );
-//    bool audioReReadSamples( short *output, int channel, long samples, int stream );
+#endif
 
@@ -93,2 +101,4 @@ public:
 
+    long getPlayTime() { return -1; }
+
 private:
diff --git a/core/multimedia/opieplayer/libmad/libmadpluginimpl.h b/core/multimedia/opieplayer/libmad/libmadpluginimpl.h
index a26b421..8ad4956 100644
--- a/core/multimedia/opieplayer/libmad/libmadpluginimpl.h
+++ b/core/multimedia/opieplayer/libmad/libmadpluginimpl.h
@@ -23,2 +23,3 @@
 
+//#include <qpe/mediaplayerplugininterface.h>
 #include "../mediaplayerplugininterface.h"
@@ -44,3 +45,2 @@ public:
     virtual MediaPlayerEncoder *encoder();
-
 private:
diff --git a/core/multimedia/opieplayer/libmad/version.c b/core/multimedia/opieplayer/libmad/version.c
index 413d54b..1baba26 100644
--- a/core/multimedia/opieplayer/libmad/version.c
+++ b/core/multimedia/opieplayer/libmad/version.c
@@ -90,2 +90,2 @@ char const mad_build[] =
 # endif
-;
+;
+\ No newline at end of file