fixed 2

5 files changed, 8 insertions, 4 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
@@ -211,13 +211,15 @@ layer3.o: layer3.c \
 huffman.o: huffman.c \
 		libmad_global.h \
 		huffman.h
 
 libmadplugin.o: libmadplugin.cpp \
 		libmadplugin.h \
+		../mediaplayerplugininterface.h \
 		mad.h
 
 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..06e19e4 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
index 9d04f7e..9f8ba65 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
@@ -462,13 +462,13 @@ bool LibMadPlugin::decode( short *output, long samples, long& samplesMade ) {
 	memcpy( &(buffer[0][offset]), d->synth.pcm.samples[0], decodedSamples * sizeof(mad_fixed_t) );
 	if ( d->synth.pcm.channels == 2 )
 	    memcpy( &(buffer[1][offset]), d->synth.pcm.samples[1], decodedSamples * sizeof(mad_fixed_t) );
 	offset += decodedSamples;
 	buffered += decodedSamples;
     }
-
+//qApp->processEvents();
     audio_pcm( output, samples, buffer[0], (d->synth.pcm.channels == 2) ? buffer[1] : 0 );
 //    audio_pcm( output, samples, buffer[1], buffer[0] );
 //    audio_pcm( output, samples, buffer[0], buffer[1] );
     samplesMade = samples;
     memmove( buffer[0], &(buffer[0][samples]), (buffered - samples) * sizeof(mad_fixed_t) );
     if ( d->synth.pcm.channels == 2 )
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.h b/core/multimedia/opieplayer/libmad/libmadplugin.h
index d85e0d4..d163458 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.h
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.h
@@ -18,13 +18,14 @@
 **
 **********************************************************************/
 #ifndef LIBMAD_PLUGIN_H 
 #define LIBMAD_PLUGIN_H
 
 #include <qstring.h>
-#include <qpe/mediaplayerplugininterface.h>
+//#include <qpe/mediaplayerplugininterface.h>
+#include "../mediaplayerplugininterface.h"
 
 
 // #define OLD_MEDIAPLAYER_API
 
 
 class LibMadPluginData;
@@ -49,12 +50,13 @@ public:
     // If decoder doesn't support audio then return 0 here
     int audioStreams();
     int audioChannels( int stream ); 
     int audioFrequency( int stream );
     int audioSamples( int stream );
     bool audioSetSample( long sample, int stream );
+    int audioBitsPerSample(int) {return 0;}
     long audioGetSample( 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 );
diff --git a/core/multimedia/opieplayer/libmad/libmadpluginimpl.h b/core/multimedia/opieplayer/libmad/libmadpluginimpl.h
index 2c5ed3b..bc864ee 100644
--- a/core/multimedia/opieplayer/libmad/libmadpluginimpl.h
+++ b/core/multimedia/opieplayer/libmad/libmadpluginimpl.h
@@ -17,13 +17,14 @@
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef LIBMAD_PLUGIN_IMPL_H 
 #define LIBMAD_PLUGIN_IMPL_H
 
-#include <qpe/mediaplayerplugininterface.h>
+//#include <qpe/mediaplayerplugininterface.h>
+#include "../mediaplayerplugininterface.h"
 
 
 class LibMadPlugin;
 
 
 class LibMadPluginImpl : public MediaPlayerPluginInterface
@@ -38,13 +39,12 @@ public:
     Q_REFCOUNT
 
 #endif
 
     virtual MediaPlayerDecoder *decoder();
     virtual MediaPlayerEncoder *encoder();
-
 private:
     LibMadPlugin *libmadplugin;
     ulong ref;
 };