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
@@ -167,42 +167,40 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \
                 libmpeg3plugin.h \
                 libmpeg3.h \
                 mpeg3private.h \
                 mpeg3atrack.h \
                 mpeg3demux.h \
                 mpeg3title.h \
                 mpeg3io.h \
                 mpeg3css.h \
                 mpeg3private.inc \
                 audio/mpeg3audio.h \
                 mpeg3vtrack.h \
                 video/mpeg3video.h \
-                mpeg3protos.h \
-                ../mediaplayerplugininterface.h
+                mpeg3protos.h
 
 libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
                 libmpeg3plugin.h \
                 libmpeg3.h \
                 mpeg3private.h \
                 mpeg3atrack.h \
                 mpeg3demux.h \
                 mpeg3title.h \
                 mpeg3io.h \
                 mpeg3css.h \
                 mpeg3private.inc \
                 audio/mpeg3audio.h \
                 mpeg3vtrack.h \
                 video/mpeg3video.h \
                 mpeg3protos.h \
-                ../mediaplayerplugininterface.h \
                 libmpeg3pluginimpl.h
 
 bitstream.o: bitstream.c \
                 mpeg3private.h \
                 mpeg3atrack.h \
                 mpeg3demux.h \
                 mpeg3title.h \
                 mpeg3io.h \
                 mpeg3css.h \
                 mpeg3private.inc \
                 audio/mpeg3audio.h \
                 mpeg3vtrack.h \
@@ -407,25 +405,25 @@ audio/layer2.o: audio/layer2.c \
                 mpeg3css.h \
                 mpeg3private.inc \
                 audio/../libmpeg3.h \
                 mpeg3private.h \
                 mpeg3atrack.h \
                 audio/mpeg3audio.h \
                 mpeg3vtrack.h \
                 video/mpeg3video.h \
                 audio/../mpeg3protos.h \
                 audio/tables.h
 
 audio/layer3.o: audio/layer3.c \
-                huffman.h \
+                audio/huffman.h \
                 audio/mpeg3audio.h \
                 audio/ac3.h \
                 audio/mpeg3real.h \
                 audio/../bitstream.h \
                 mpeg3demux.h \
                 mpeg3title.h \
                 mpeg3io.h \
                 mpeg3css.h \
                 mpeg3private.inc \
                 audio/../libmpeg3.h \
                 mpeg3private.h \
                 mpeg3atrack.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
@@ -11,31 +11,29 @@
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef LIBMPEG3_PLUGIN_H 
 #define LIBMPEG3_PLUGIN_H
 
-
 #include <qstring.h>
 #include <qapplication.h>
 #include "libmpeg3.h"
 #include "mpeg3protos.h"
-//#include <qpe/mediaplayerplugininterface.h>
-#include "../mediaplayerplugininterface.h"
+#include <qpe/mediaplayerplugininterface.h>
 
 
 // #define OLD_MEDIAPLAYER_API
 
 
 class LibMpeg3Plugin : public MediaPlayerDecoder {
 
 public:
     LibMpeg3Plugin() { file = NULL; }
     ~LibMpeg3Plugin() { close(); }
 
     const char *pluginName() { return "LibMpeg3Plugin"; }
@@ -43,25 +41,24 @@ public:
     double pluginVersion() { return 1.0; }
 
     bool isFileSupported( const QString& fileName ) { return mpeg3_check_sig( (char *)fileName.latin1() ) == 1; }
     bool open( const QString& fileName ) { file = mpeg3_open( (char *)fileName.latin1() ); return file != NULL; }
     bool close() { if ( file ) { int r = mpeg3_close( file ); file = NULL; return r == 1; } return FALSE; }
     bool isOpen() { return file != NULL; }
     const QString &fileInfo() { return strInfo = ""; }
 
     // If decoder doesn't support audio then return 0 here
     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; }
 #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 );
 #endif
 
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
@@ -11,27 +11,25 @@
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef LIBMPEG3_PLUGIN_IMPL_H 
 #define LIBMPEG3_PLUGIN_IMPL_H
 
-
-//#include <qpe/mediaplayerplugininterface.h>
-#include "../mediaplayerplugininterface.h"
+#include <qpe/mediaplayerplugininterface.h>
 
 
 class LibMpeg3Plugin;
 
 
 class LibMpeg3PluginImpl : public MediaPlayerPluginInterface
 {
 public:
     LibMpeg3PluginImpl();
     virtual ~LibMpeg3PluginImpl();
 
 #ifndef QT_NO_COMPONENT