fixed 2

27 files changed, 432 insertions, 182 deletions

diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 1d2ff5e..e8ccc34 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -135,8 +135,10 @@ REQUIRES=
 ####### Compile
 
 main.o: main.cpp \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpedecoration_qws.h \
+		$(OPIEDIR)/include/timestring.h \
 		mediaplayerstate.h \
 		playlistwidget.h \
 		$(OPIEDIR)/include/qpe/applnk.h \
 		audiowidget.h \
@@ -144,13 +146,15 @@ main.o: main.cpp \
 		loopcontrol.h \
 		mediaplayer.h \
 		$(OPIEDIR)/include/qpe/qlibrary.h \
 		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h
+		$(OPIEDIR)/include/qpe/quuid.h \
+		$(OPIEDIR)/include/qpe/mediaplayerplugininterface.h
 
 loopcontrol.o: loopcontrol.cpp \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+		$(OPIEDIR)/include/qpedecoration_qws.h \
+		$(OPIEDIR)/include/timestring.h \
 		loopcontrol.h \
 		videowidget.h \
 		audiodevice.h \
 		mediaplayerplugininterface.h \
@@ -164,19 +168,25 @@ playlistselection.o: playlistselection.cpp \
 		playlistselection.h
 
 mediaplayerstate.o: mediaplayerstate.cpp \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpedecoration_qws.h \
+		$(OPIEDIR)/include/timestring.h \
 		$(OPIEDIR)/include/qpe/qlibrary.h \
 		$(OPIEDIR)/include/qpe/qcom.h \
 		$(OPIEDIR)/include/qpe/quuid.h \
 		$(OPIEDIR)/include/qpe/config.h \
+		mediaplayerplugininterface.h \
 		mediaplayerstate.h \
 		libmad/libmadpluginimpl.h \
 		libmpeg3/libmpeg3pluginimpl.h \
 		wavplugin/wavpluginimpl.h
 
 videowidget.o: videowidget.cpp \
 		$(OPIEDIR)/include/qpe/resource.h \
+		mediaplayerplugininterface.h \
+		$(OPIEDIR)/include/qpe/qcom.h \
+		$(OPIEDIR)/include/qpe/quuid.h \
 		videowidget.h \
 		mediaplayerstate.h
 
 audiowidget.o: audiowidget.cpp \
@@ -187,8 +197,13 @@ audiowidget.o: audiowidget.cpp \
 playlistwidget.o: playlistwidget.cpp \
 		$(OPIEDIR)/include/qpe/qpemenubar.h \
 		$(OPIEDIR)/include/qpe/qpetoolbar.h \
 		$(OPIEDIR)/include/qpe/fileselector.h \
+		$(OPIEDIR)/include/filemanager.h \
+		$(OPIEDIR)/include/applnk.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpedecoration_qws.h \
+		$(OPIEDIR)/include/timestring.h \
 		$(OPIEDIR)/include/qpe/applnk.h \
 		$(OPIEDIR)/include/qpe/config.h \
 		$(OPIEDIR)/include/qpe/global.h \
 		$(OPIEDIR)/include/qpe/resource.h \
@@ -197,14 +212,17 @@ playlistwidget.o: playlistwidget.cpp \
 		mediaplayerstate.h
 
 mediaplayer.o: mediaplayer.cpp \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpedecoration_qws.h \
+		$(OPIEDIR)/include/timestring.h \
 		$(OPIEDIR)/include/qpe/qlibrary.h \
 		$(OPIEDIR)/include/qpe/qcom.h \
 		$(OPIEDIR)/include/qpe/quuid.h \
 		$(OPIEDIR)/include/qpe/resource.h \
 		$(OPIEDIR)/include/qpe/config.h \
 		mediaplayer.h \
+		$(OPIEDIR)/include/qpe/mediaplayerplugininterface.h \
 		playlistwidget.h \
 		$(OPIEDIR)/include/qpe/applnk.h \
 		audiowidget.h \
 		loopcontrol.h \
@@ -212,11 +230,12 @@ mediaplayer.o: mediaplayer.cpp \
 		mediaplayerstate.h
 
 audiodevice.o: audiodevice.cpp \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpedecoration_qws.h \
+		$(OPIEDIR)/include/timestring.h \
 		$(OPIEDIR)/include/qpe/config.h \
-		audiodevice.h \
-		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h
+		audiodevice.h
 
 moc_loopcontrol.o: moc_loopcontrol.cpp \
 		loopcontrol.h
 
@@ -240,9 +259,10 @@ moc_playlistwidget.o: moc_playlistwidget.cpp \
 moc_mediaplayer.o: moc_mediaplayer.cpp \
 		mediaplayer.h \
 		$(OPIEDIR)/include/qpe/qlibrary.h \
 		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h
+		$(OPIEDIR)/include/qpe/quuid.h \
+		$(OPIEDIR)/include/qpe/mediaplayerplugininterface.h
 
 moc_audiodevice.o: moc_audiodevice.cpp \
 		audiodevice.h
 
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp
index 7b3700a..9a10eb4 100644
--- a/core/multimedia/opieplayer/audiodevice.cpp
+++ b/core/multimedia/opieplayer/audiodevice.cpp
@@ -1,8 +1,8 @@
 /**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of the Qtopia Environment.
+** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -16,10 +16,12 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
+// L.J.Potter added better error code Fri 02-15-2002 14:37:47
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include "audiodevice.h"
 
@@ -105,19 +107,20 @@ void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume
     formatData.nSamplesPerSec = 44000;
     formatData.wBitsPerSample = 16;
     waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL);
     if ( waveOutGetVolume( handle, (LPDWORD)&volume ) )
-	qDebug( "get volume of audio device failed" );
+//  qDebug( "get volume of audio device failed" );
     waveOutClose( handle );
     leftVolume = volume & 0xFFFF;
     rightVolume = volume >> 16;
 #else
     int mixerHandle = open( "/dev/mixer", O_RDWR );
     if ( mixerHandle >= 0 ) {
-        ioctl( mixerHandle, MIXER_READ(0), &volume );
+        if(ioctl( mixerHandle, MIXER_READ(0), &volume )==-1)
+        perror("ioctl(\"MIXER_READ\")");
         close( mixerHandle );
     } else
-	qDebug( "get volume of audio device failed" );
+        perror("open(\"/dev/mixer\")");
     leftVolume  = ((volume & 0x00FF) << 16) / 101;
     rightVolume = ((volume & 0xFF00) <<  8) / 101;
 #endif
 }
@@ -146,9 +149,9 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume,
     formatData.wBitsPerSample = 16;
     waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL);
     unsigned int volume = (rightVolume << 16) | leftVolume;
     if ( waveOutSetVolume( handle, volume ) )
-	qDebug( "set volume of audio device failed" );
+//  qDebug( "set volume of audio device failed" );
     waveOutClose( handle );
 #else
     // Volume can be from 0 to 100 which is 101 distinct values
     unsigned int rV = (rightVolume * 101) >> 16;
@@ -157,12 +160,14 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume,
     unsigned int lV = (leftVolume  * 101) >> 16;
     unsigned int volume = ((rV << 8) & 0xFF00) | (lV & 0x00FF);
     int mixerHandle = 0;
     if ( ( mixerHandle = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
-        ioctl( mixerHandle, MIXER_WRITE(0), &volume );
+        if(ioctl( mixerHandle, MIXER_WRITE(0), &volume ) ==-1)
+            perror("ioctl(\"MIXER_WRITE\")");
         close( mixerHandle );
     } else
-	qDebug( "set volume of audio device failed" );
+        perror("open(\"/dev/mixer\")");
+
 # else
     // This is the way this has to be done now I guess, doesn't allow for
     // independant right and left channel setting, or setting for different outputs
     Config cfg("Sound");
@@ -185,54 +190,26 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
     d = new AudioDevicePrivate;
     d->frequency = f;
     d->channels = chs;
     d->bytesPerSample = bps;
+//    qDebug("%d",bps);
+    int format=0;
+    if( bps == 8)  format  = AFMT_U8;
+    else if( bps <= 0) format = AFMT_S16_LE;
+    else format = AFMT_S16_LE;
 
+//    qDebug("AD- freq %d, channels %d, b/sample %d, bitrate %d",f,chs,bps,format);
     connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) );
 
-#ifdef Q_OS_WIN32
-    UINT	    result;
-    WAVEFORMATEX    formatData;
-    formatData.cbSize = sizeof(WAVEFORMATEX);
-/*
-    // Other possible formats windows supports
-    formatData.wFormatTag = WAVE_FORMAT_MPEG;
-    formatData.wFormatTag = WAVE_FORMAT_MPEGLAYER3;
-    formatData.wFormatTag = WAVE_FORMAT_ADPCM;
-*/
-    formatData.wFormatTag = WAVE_FORMAT_PCM;
-    formatData.nAvgBytesPerSec = bps * chs * f;
-    formatData.nBlockAlign = bps * chs;
-    formatData.nChannels = chs;
-    formatData.nSamplesPerSec = f;
-    formatData.wBitsPerSample = bps * 8;
-    // Open a waveform device for output
-    if (result = waveOutOpen((LPHWAVEOUT)&d->handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL)) {
-	QString errorMsg = "error opening audio device.\nReason: %i - ";
-	switch (result) {
-	    case MMSYSERR_ALLOCATED:	errorMsg += "Specified resource is already allocated."; break;
-	    case MMSYSERR_BADDEVICEID:	errorMsg += "Specified device identifier is out of range."; break;
-	    case MMSYSERR_NODRIVER:	errorMsg += "No device driver is present."; break;
-	    case MMSYSERR_NOMEM:	errorMsg += "Unable to allocate or lock memory."; break;
-	    case WAVERR_BADFORMAT:	errorMsg += "Attempted to open with an unsupported waveform-audio format."; break;
-	    case WAVERR_SYNC:		errorMsg += "The device is synchronous but waveOutOpen was called without using the WAVE_ALLOWSYNC flag."; break;
-	    default:			errorMsg += "Undefined error"; break;
-	}
-	qDebug( errorMsg, result );
-    }
-
-    d->bufferSize = sound_fragment_bytes;
-#else
 
     int fragments = 0x10000 * 8 + sound_fragment_shift;
-    int format = AFMT_S16_LE;
     int capabilities = 0;
 
 #ifdef KEEP_DEVICE_OPEN
     if ( AudioDevicePrivate::dspFd == 0 ) {
 #endif
     if ( ( d->handle = ::open( "/dev/dsp", O_WRONLY ) ) < 0 ) {
-	qDebug( "error opening audio device /dev/dsp, sending data to /dev/null instead" );
+        perror("open(\"/dev/dsp\") sending to /dev/null instead");
 	d->handle = ::open( "/dev/null", O_WRONLY );
     }
 #ifdef KEEP_DEVICE_OPEN 
 	AudioDevicePrivate::dspFd = d->handle;
@@ -240,15 +217,22 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
         d->handle = AudioDevicePrivate::dspFd;
     }
 #endif
 
-    ioctl( d->handle, SNDCTL_DSP_GETCAPS, &capabilities );
-    ioctl( d->handle, SNDCTL_DSP_SETFRAGMENT, &fragments );
-    ioctl( d->handle, SNDCTL_DSP_SETFMT, &format );
-    ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency );
+    if(ioctl( d->handle, SNDCTL_DSP_GETCAPS, &capabilities )==-1)
+        perror("ioctl(\"SNDCTL_DSP_GETCAPS\")");
+    if(ioctl( d->handle, SNDCTL_DSP_SETFRAGMENT, &fragments )==-1)
+        perror("ioctl(\"SNDCTL_DSP_SETFRAGMENT\")");
+    if(ioctl( d->handle, SNDCTL_DSP_SETFMT, & format )==-1)
+        perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
+    qDebug("freq %d", d->frequency);
+    if(ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency )==-1)
+        perror("ioctl(\"SNDCTL_DSP_SPEED\")");
+    qDebug("channels %d",d->channels);
     if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) {
 	d->channels = ( d->channels == 1 ) ? 2 : d->channels;
-	ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels );
+        if(ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels )==-1)
+            perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
     }
 
     d->bufferSize = sound_fragment_bytes;
     d->unwrittenBuffer = new char[d->bufferSize];
@@ -260,9 +244,8 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
     //if ( capabilities & DSP_CAP_BATCH )   qDebug( "Sound card has local buffer" );
     //if ( capabilities & DSP_CAP_REALTIME )qDebug( "Sound card has realtime sync" );
     //if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" );
     //if ( capabilities & DSP_CAP_MMAP )    qDebug( "Sound card can mmap" );
-#endif
 }
     
 
 AudioDevice::~AudioDevice() {
diff --git a/core/multimedia/opieplayer/audiodevice.h b/core/multimedia/opieplayer/audiodevice.h
index ec70788..d59c388 100644
--- a/core/multimedia/opieplayer/audiodevice.h
+++ b/core/multimedia/opieplayer/audiodevice.h
@@ -1,8 +1,8 @@
 /**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of the Qtopia Environment.
+** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -16,21 +16,25 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
+// L.J.Potter added changes Fri 02-15-2002
+
 #ifndef AUDIODEVICE_H
 #define AUDIODEVICE_H
 
+
 #include <qobject.h>
+#include <sys/soundcard.h>
 
 
 class AudioDevicePrivate;
 
 
 class AudioDevice : public QObject {
     Q_OBJECT
 public:
-    AudioDevice( unsigned int freq = 44000, unsigned int channels = 2, unsigned int bytesPerSample = 2 );
+    AudioDevice( unsigned int freq = 44000, unsigned int channels = 2, unsigned int bytesPerSample = AFMT_S16_LE );
     ~AudioDevice();
 
     unsigned int canWrite() const;
     void write( char *buffer, unsigned int length );
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index 1e0757f..582660c 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -1,8 +1,8 @@
 /**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of the Qtopia Environment.
+** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -59,9 +59,9 @@ static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton));
 
 AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     QWidget( parent, name, f )
 {
-    setCaption( tr("MediaPlayer") );
+    setCaption( tr("OpiePlayer") );
     setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
     pixmaps[0] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButtonsAll" ) );
     pixmaps[1] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButtonsBig" ) );
     pixmaps[2] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaControls" ) );
diff --git a/core/multimedia/opieplayer/audiowidget.h b/core/multimedia/opieplayer/audiowidget.h
index 95f5322..53e84b3 100644
--- a/core/multimedia/opieplayer/audiowidget.h
+++ b/core/multimedia/opieplayer/audiowidget.h
@@ -1,8 +1,8 @@
 /**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of the Qtopia Environment.
+** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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
@@ -213,11 +213,13 @@ huffman.o: huffman.c \
 		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
@@ -464,9 +464,9 @@ bool LibMadPlugin::decode( short *output, long samples, long& samplesMade ) {
 	    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;
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
@@ -20,9 +20,10 @@
 #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
 
@@ -51,8 +52,9 @@ public:
     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 );
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
@@ -19,9 +19,10 @@
 **********************************************************************/
 #ifndef LIBMAD_PLUGIN_IMPL_H 
 #define LIBMAD_PLUGIN_IMPL_H
 
-#include <qpe/mediaplayerplugininterface.h>
+//#include <qpe/mediaplayerplugininterface.h>
+#include "../mediaplayerplugininterface.h"
 
 
 class LibMadPlugin;
 
@@ -40,9 +41,8 @@ public:
 #endif
 
     virtual MediaPlayerDecoder *decoder();
     virtual MediaPlayerEncoder *encoder();
-
 private:
     LibMadPlugin *libmadplugin;
     ulong ref;
 };
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
@@ -175,9 +175,10 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \
 		mpeg3private.inc \
 		audio/mpeg3audio.h \
 		mpeg3vtrack.h \
 		video/mpeg3video.h \
-		mpeg3protos.h
+		mpeg3protos.h \
+		../mediaplayerplugininterface.h
 
 libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
 		libmpeg3plugin.h \
 		libmpeg3.h \
@@ -191,8 +192,9 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
 		audio/mpeg3audio.h \
 		mpeg3vtrack.h \
 		video/mpeg3video.h \
 		mpeg3protos.h \
+		../mediaplayerplugininterface.h \
 		libmpeg3pluginimpl.h
 
 bitstream.o: bitstream.c \
 		mpeg3private.h \
@@ -413,9 +415,9 @@ audio/layer2.o: audio/layer2.c \
 		audio/../mpeg3protos.h \
 		audio/tables.h
 
 audio/layer3.o: audio/layer3.c \
-		audio/huffman.h \
+		huffman.h \
 		audio/mpeg3audio.h \
 		audio/ac3.h \
 		audio/mpeg3real.h \
 		audio/../bitstream.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
@@ -34,8 +34,9 @@ SOURCES		=   libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
 		    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
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
@@ -23,9 +23,10 @@
 #include <qstring.h>
 #include <qapplication.h>
 #include "libmpeg3.h"
 #include "mpeg3protos.h"
-#include <qpe/mediaplayerplugininterface.h>
+//#include <qpe/mediaplayerplugininterface.h>
+#include "../mediaplayerplugininterface.h"
 
 
 // #define OLD_MEDIAPLAYER_API
 
@@ -49,8 +50,9 @@ public:
     // 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
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
@@ -19,9 +19,10 @@
 **********************************************************************/
 #ifndef LIBMPEG3_PLUGIN_IMPL_H 
 #define LIBMPEG3_PLUGIN_IMPL_H
 
-#include <qpe/mediaplayerplugininterface.h>
+//#include <qpe/mediaplayerplugininterface.h>
+#include "../mediaplayerplugininterface.h"
 
 
 class LibMpeg3Plugin;
 
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp
index dd466ed..90a7cc6 100644
--- a/core/multimedia/opieplayer/loopcontrol.cpp
+++ b/core/multimedia/opieplayer/loopcontrol.cpp
@@ -1,8 +1,8 @@
 /**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of the Qtopia Environment.
+** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -16,14 +16,16 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
+// L.J.Potter added changes Fri 02-15-2002
+
+
 #include <qpe/qpeapplication.h>
-#ifdef Q_WS_QWS
 
+#ifdef Q_WS_QWS
 #include <qpe/qcopenvelope_qws.h>
 #endif
-#include <qpe/mediaplayerplugininterface.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
@@ -31,8 +33,9 @@
 #include <unistd.h>
 #include "loopcontrol.h"
 #include "videowidget.h"
 #include "audiodevice.h"
+#include "mediaplayerplugininterface.h"
 #include "mediaplayerstate.h"
 
 
 extern VideoWidget *videoUI; // now only needed to tell it to play a frame
@@ -101,12 +104,10 @@ LoopControl::LoopControl( QObject *parent, const char *name )
 
     audioMutex = new Mutex;
 
     pthread_attr_init(&audio_attr);
-
-    if ( getuid() == 0 ) {
-        printf("true, guid = %i\n", getuid());
-
+#define USE_REALTIME_AUDIO_THREAD
+#ifdef USE_REALTIME_AUDIO_THREAD
 	// Attempt to set it to real-time round robin
 	if ( pthread_attr_setschedpolicy( &audio_attr, SCHED_RR ) == 0 ) {
 	    sched_param params;
 	    params.sched_priority = 50;
@@ -115,12 +116,9 @@ LoopControl::LoopControl( QObject *parent, const char *name )
 	    qDebug( "Error setting up a realtime thread, reverting to using a normal thread." );
 	    pthread_attr_destroy(&audio_attr);
 	    pthread_attr_init(&audio_attr);
 	}
-    }
-//    printf("false, guid = %i\n", getuid());
-    usleep( 100 );
-
+#endif
     pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this);
 }
 
 
@@ -233,24 +231,25 @@ void LoopControl::startAudio() {
 	    if ( currentSample != audioSampleCounter + 1 )
 		qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter);
 
 	    long samplesRead = 0;
-	    mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream );
+      bool readOk=mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream );
 	    long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000;
 	    long sampleWaitTime = currentSample - sampleWeShouldBeAt;
 
 	    if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) {
 		usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) );
-	    } else if ( sampleWaitTime <= -5000 ) {
+        }
+      else if ( sampleWaitTime <= -5000 ) {
 		qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
 		//mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
 		currentSample = sampleWeShouldBeAt;
 	    }
 
 	    audioDevice->write( audioBuffer, samplesRead * 2 * channels );
 	    audioSampleCounter = currentSample + samplesRead - 1;
 
-	    moreAudio = audioSampleCounter <= total_audio_samples;
+      moreAudio = readOk && (audioSampleCounter <= total_audio_samples);
 
 	} else {
 
 	    moreAudio = FALSE;
@@ -378,25 +377,25 @@ bool LoopControl::init( const QString& filename ) {
     if ( hasAudioChannel ) {
 	int astream = 0;
 
 	channels = mediaPlayerState->curDecoder()->audioChannels( astream );
-	DecodeLoopDebug(( "channels = %d\n", channels ));
+  qDebug( "LC- channels = %d", channels );
 	
 	if ( !total_audio_samples )
 	    total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream );
 
-	total_audio_samples += 1000;
+//  total_audio_samples += 1000;
 
 	mediaPlayerState->setLength( total_audio_samples );
 	
 	freq = mediaPlayerState->curDecoder()->audioFrequency( astream );
-	DecodeLoopDebug(( "frequency = %d\n", freq ));
+  qDebug( "LC- frequency = %d", freq );
 
 	audioSampleCounter = 0;
 
-	static const int bytes_per_sample = 2; //16 bit
+   int bits_per_sample = mediaPlayerState->curDecoder()->audioBitsPerSample( astream);
 
-	audioDevice = new AudioDevice( freq, channels, bytes_per_sample );
+  audioDevice = new AudioDevice( freq, channels, bits_per_sample);
 	audioBuffer = new char[ audioDevice->bufferSize() ];
 	channels = audioDevice->channels();
 
 	//### must check which frequency is actually used.
diff --git a/core/multimedia/opieplayer/loopcontrol.h b/core/multimedia/opieplayer/loopcontrol.h
index 3191259..f4a7fcd 100644
--- a/core/multimedia/opieplayer/loopcontrol.h
+++ b/core/multimedia/opieplayer/loopcontrol.h
@@ -1,8 +1,8 @@
 /**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of the Qtopia Environment.
+** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -16,11 +16,15 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
+// L.J.Potter added changes Fri 02-15-2002
+
+
 #ifndef MPEGVIEW_H
 #define MPEGVIEW_H
 
+
 #include <qwidget.h>
 #include <qdatetime.h>
 
 
diff --git a/core/multimedia/opieplayer/loopcontrol_threaded.cpp b/core/multimedia/opieplayer/loopcontrol_threaded.cpp
index eb89b85..c7dc7a8 100644
--- a/core/multimedia/opieplayer/loopcontrol_threaded.cpp
+++ b/core/multimedia/opieplayer/loopcontrol_threaded.cpp
@@ -1,8 +1,8 @@
 /**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of the Qtopia Environment.
+** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -16,19 +16,17 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-
 #define _REENTRANT
 
-
 #include <qpe/qpeapplication.h>
 #include <qimage.h>
 #include <qpainter.h>
 #ifdef Q_WS_QWS
 #include <qpe/qcopenvelope_qws.h>
 #endif
-#include <qpe/mediaplayerplugininterface.h>
+#include "mediaplayerplugininterface.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
diff --git a/core/multimedia/opieplayer/loopcontrol_threaded.h b/core/multimedia/opieplayer/loopcontrol_threaded.h
index ced6ac8..1031169 100644
--- a/core/multimedia/opieplayer/loopcontrol_threaded.h
+++ b/core/multimedia/opieplayer/loopcontrol_threaded.h
@@ -1,8 +1,8 @@
 /**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of the Qtopia Environment.
+** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -19,10 +19,8 @@
 **********************************************************************/
 #ifndef MPEGVIEW_H
 #define MPEGVIEW_H
 
-
-
 #include <qwidget.h>
 #include <qdatetime.h>
 
 
diff --git a/core/multimedia/opieplayer/mediaplayerplugininterface.h b/core/multimedia/opieplayer/mediaplayerplugininterface.h
index aeeffde..339b2e4 100644
--- a/core/multimedia/opieplayer/mediaplayerplugininterface.h
+++ b/core/multimedia/opieplayer/mediaplayerplugininterface.h
@@ -19,9 +19,8 @@
 **********************************************************************/
 #ifndef MEDIA_PLAYER_PLUGIN_INTERFACE_H
 #define MEDIA_PLAYER_PLUGIN_INTERFACE_H
 
-
 #include <qpe/qcom.h>
 
 #ifndef QT_NO_COMPONENT
 // {c0093632-b44c-4cf7-a279-d82fe8a8890c}
@@ -61,14 +60,9 @@ public:
     virtual int audioFrequency( int stream ) = 0;
     virtual int audioSamples( int stream ) = 0;
     virtual bool audioSetSample( long sample, int stream ) = 0;
     virtual long audioGetSample( int stream ) = 0;
-//    virtual bool audioReadMonoSamples( short *samples, long samples, long& samplesRead, int stream ) = 0;
-//    virtual bool audioReadStereoSamples( short *samples, long samples, long& samplesRead, int stream ) = 0;
     virtual bool audioReadSamples( short *samples, int channels, long samples, long& samplesRead, int stream ) = 0;
-    // Libmpeg3 functions, perhaps good for reading an audio file with 5 channels or something!
-//    virtual bool audioReadSamples( short *samples, int channel, long samples, int stream ) = 0;
-//    virtual bool audioReReadSamples( short *samples, int channel, long samples, int stream ) = 0;
 
     // If decoder doesn't support video then return 0 here
     virtual int videoStreams() = 0;
     virtual int videoWidth( int stream ) = 0;
@@ -96,8 +90,11 @@ public:
     virtual bool supportsSMP() = 0;
     virtual bool supportsStereo() = 0;
     virtual bool supportsScaling() = 0;
 
+    // File Properies
+    virtual long getPlayTime() { return -1; }
+    virtual int audioBitsPerSample( int stream ) = 0;
 };
 
 
 class MediaPlayerEncoder;
diff --git a/core/multimedia/opieplayer/mediaplayerstate.cpp b/core/multimedia/opieplayer/mediaplayerstate.cpp
index 7e82166..13741f6 100644
--- a/core/multimedia/opieplayer/mediaplayerstate.cpp
+++ b/core/multimedia/opieplayer/mediaplayerstate.cpp
@@ -1,8 +1,8 @@
 /**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of the Qtopia Environment.
+** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -18,25 +18,26 @@
 **
 **********************************************************************/
 #include <qpe/qpeapplication.h>
 #include <qpe/qlibrary.h>
-#include <qpe/mediaplayerplugininterface.h>
 #include <qpe/config.h>
 #include <qvaluelist.h>
 #include <qobject.h>
 #include <qdir.h>
+#include "mediaplayerplugininterface.h"
 #include "mediaplayerstate.h"
 
+
 #ifdef QT_NO_COMPONENT
 // Plugins which are compiled in when no plugin architecture available
 #include "libmad/libmadpluginimpl.h"
 #include "libmpeg3/libmpeg3pluginimpl.h"
 #include "wavplugin/wavpluginimpl.h"
 #endif
 
 
-#define MediaPlayerDebug(x)	qDebug x
-//#define MediaPlayerDebug(x)
+//#define MediaPlayerDebug(x) qDebug x
+#define MediaPlayerDebug(x)
 
 
 MediaPlayerState::MediaPlayerState( QObject *parent, const char *name )
     : QObject( parent, name ), decoder( NULL ), libmpeg3decoder( NULL ) {
@@ -113,8 +114,12 @@ MediaPlayerDecoder *MediaPlayerState::curDecoder() {
 MediaPlayerDecoder *MediaPlayerState::libMpeg3Decoder() {
     return libmpeg3decoder;
 }
 
+// ### hack to get true sample count
+// MediaPlayerDecoder *MediaPlayerState::libWavDecoder() {
+//     return libwavdecoder;
+// }
 
 void MediaPlayerState::loadPlugins() {
 
 #ifndef QT_NO_COMPONENT
diff --git a/core/multimedia/opieplayer/mpegplayer.pro b/core/multimedia/opieplayer/mpegplayer.pro
index 3b8d4b0..41f2de0 100644
--- a/core/multimedia/opieplayer/mpegplayer.pro
+++ b/core/multimedia/opieplayer/mpegplayer.pro
@@ -1,6 +1,7 @@
 TEMPLATE	= app
 CONFIG		= qt warn_on release
+#release
 DESTDIR		= $(OPIEDIR)/bin
 HEADERS		= loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \
 		  videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h
 SOURCES		= main.cpp \
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp
index a82b594..2c62e86 100644
--- a/core/multimedia/opieplayer/playlistselection.cpp
+++ b/core/multimedia/opieplayer/playlistselection.cpp
@@ -49,12 +49,14 @@ private:
 
 PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
     : QListView( parent, name )
 {
-#ifdef USE_PLAYLIST_BACKGROUND
+// #ifdef USE_PLAYLIST_BACKGROUND
     setStaticBackground( TRUE );
-    setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) );
-#endif
+//    setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) );
+    setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) );
+// #endif
+    addColumn("Title",236);
     setAllColumnsShowFocus( TRUE );
     addColumn( tr( "Playlist Selection" ) );
     header()->hide();
     setSorting( -1, FALSE );
@@ -64,16 +66,17 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
 PlayListSelection::~PlayListSelection() {
 }
 
 
-#ifdef USE_PLAYLIST_BACKGROUND
+// #ifdef USE_PLAYLIST_BACKGROUND
 void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) {
     p->fillRect( r, QBrush( white ) );
-    QImage logo = Resource::loadImage( "mpegplayer/background" );
+//    QImage logo = Resource::loadImage( "mpegplayer/background" );
+    QImage logo = Resource::loadImage( "opielogo" );
     if ( !logo.isNull() )
 	p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo );
 }
-#endif
+// #endif
 
 
 void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) {
     if ( event->state() == QMouseEvent::LeftButton ) {
diff --git a/core/multimedia/opieplayer/playlistselection.h b/core/multimedia/opieplayer/playlistselection.h
index 22d3c74..57e10f1 100644
--- a/core/multimedia/opieplayer/playlistselection.h
+++ b/core/multimedia/opieplayer/playlistselection.h
@@ -19,10 +19,8 @@
 **********************************************************************/
 #ifndef PLAY_LIST_SELECTION_H
 #define PLAY_LIST_SELECTION_H
 
-
-
 #include <qlist.h>
 #include <qlistview.h>
 #include <qpe/applnk.h>
 
@@ -46,12 +44,12 @@ public slots:
     bool last();
 
 protected:
     virtual void contentsMouseMoveEvent(QMouseEvent *);
-#ifdef USE_PLAYLIST_BACKGROUND
+/* #ifdef USE_PLAYLIST_BACKGROUND */
     virtual void drawBackground( QPainter *p, const QRect &r );
     virtual void paintEmptyArea( QPainter *p, const QRect &r ) { drawBackground( p, r ); };
-#endif
+/* #endif */
 
 private:
     QList<DocLnk>   selectedList;
     const DocLnk    *lnk;
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 0423e7a..202f351 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -1,8 +1,8 @@
 /**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of the Qtopia Environment.
+** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -20,8 +20,10 @@
 
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/fileselector.h>
+#include <qpe/qpeapplication.h>
+
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
@@ -34,27 +36,31 @@
 #include <qlistbox.h>
 #include <qmainwindow.h>
 #include <qmessagebox.h>
 #include <qtoolbutton.h>
+#include <qtabwidget.h>
+#include <qlistview.h>
+#include <qpoint.h>
+//#include <qtimer.h>
 
 #include "playlistselection.h"
 #include "playlistwidget.h"
 #include "mediaplayerstate.h"
 
 #include <stdlib.h>
 
+#define BUTTONS_ON_TOOLBAR
+#define SIDE_BUTTONS
+#define CAN_SAVE_LOAD_PLAYLISTS
 
 extern MediaPlayerState *mediaPlayerState;
 
+// class myFileSelector {
 
+// };
 class PlayListWidgetPrivate {
 public:
-    QToolButton *tbPlay;
-    QToolButton *tbFull;
-    QToolButton *tbLoop;
-    QToolButton *tbScale;
-    QToolButton *tbShuffle;
-
+    QToolButton *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList,  *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove;
     QFrame *playListFrame;
     FileSelector *files;
     PlayListSelection *selectedFiles;
     bool setDocumentUsed;
@@ -92,12 +98,14 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
     d = new PlayListWidgetPrivate;
     d->setDocumentUsed = FALSE;
     d->current = NULL;
+//    menuTimer = new QTimer( this ,"menu timer"),
+//     connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) );
 
     setBackgroundMode( PaletteButton );
 
-    setCaption( tr("MediaPlayer") );
+    setCaption( tr("OpiePlayer") );
     setIcon( Resource::loadPixmap( "MPEGPlayer" ) );
 
     setToolBarsMovable( FALSE );
 
@@ -110,81 +118,148 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     menu->setMargin( 0 );
 
     QPEToolBar *bar = new QPEToolBar( this );
     bar->setLabel( tr( "Play Operations" ) );
-#ifdef BUTTONS_ON_TOOLBAR
+    d->tbAddToList =  new ToolButton( bar, tr( "Add to Playlist" ),"mpegplayer/add_to_playlist",this , SLOT(addSelected()) );
+    d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "mpegplayer/remove_from_playlist", this , SLOT(removeSelected()) );
     d->tbPlay    = new ToolButton( bar, tr( "Play" ),       "mpegplayer/play",    mediaPlayerState, SLOT(setPlaying(bool)), TRUE );
     d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),  "mpegplayer/shuffle", mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
-#endif
     d->tbLoop    = new ToolButton( bar, tr( "Loop" ),       "mpegplayer/loop",    mediaPlayerState, SLOT(setLooping(bool)), TRUE );
-    d->tbFull    = new ToolButton( bar, tr( "Fullscreen" ), "fullscreen",         mediaPlayerState, SLOT(setFullscreen(bool)), TRUE );
-    d->tbScale   = new ToolButton( bar, tr( "Scale" ),      "mpegplayer/scale",   mediaPlayerState, SLOT(setScaled(bool)), TRUE );
 
     QPopupMenu *pmPlayList = new QPopupMenu( this );
-    menu->insertItem( tr( "PlayList" ), pmPlayList );
-    new MenuItem( pmPlayList, tr( "Toggle PlayList" ),	   mediaPlayerState, SLOT( togglePlaylist() ) );
+    menu->insertItem( tr( "File" ), pmPlayList );
     new MenuItem( pmPlayList, tr( "Clear List" ),          this,             SLOT( clearList() ) );
-    new MenuItem( pmPlayList, tr( "Add all music files" ), this,             SLOT( addAllMusicToList() ) );
+    new MenuItem( pmPlayList, tr( "Add all audio files" ), this,             SLOT( addAllMusicToList() ) );
     new MenuItem( pmPlayList, tr( "Add all video files" ), this,             SLOT( addAllVideoToList() ) );
     new MenuItem( pmPlayList, tr( "Add all files" ),       this,             SLOT( addAllToList() ) );
-#ifdef CAN_SAVE_LOAD_PLAYLISTS
     new MenuItem( pmPlayList, tr( "Save PlayList" ),       this,             SLOT( saveList() ) );
     new MenuItem( pmPlayList, tr( "Load PlayList" ),       this,             SLOT( loadList() ) );
-#endif
+
+    QPopupMenu *pmView = new QPopupMenu( this );
+    menu->insertItem( tr( "View" ), pmView );
+
+    fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0);
+    connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) );
+    fullScreenButton->addTo(pmView);
+    scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("mpegplayer/scale"), QString::null, 0, this, 0);
+    connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) );
+    scaleButton->addTo(pmView);
 
     QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton );
+    QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton );
+
+    QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton );
+    
+    tabWidget = new QTabWidget( hbox6, "tabWidget" ); 
+    tabWidget->setTabShape(QTabWidget::Triangular);
+
+    QWidget *pTab;
+    pTab = new QWidget( tabWidget, "pTab" );
+    playlistView = new QListView( pTab, "Videoview" );
+    playlistView->setMinimumSize(236,260);
+    tabWidget->insertTab( pTab,"Playlist");
 
     // Add the playlist area
-    QVBox *vbox3 = new QVBox( vbox5 ); vbox3->setBackgroundMode( PaletteButton );
-    d->playListFrame = vbox3;
 
-    QLabel *plString = new QLabel( tr(" PlayList"), vbox3 );    
-    plString->setBackgroundMode( QButton::PaletteButton );
-    plString->setFont( QFont( "Helvetica", 8, QFont::Bold ) );
+    QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton );
+    d->playListFrame = vbox3;
+    d->playListFrame ->setMinimumSize(235,260);
 
     QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton );
+
     d->selectedFiles = new PlayListSelection( hbox2 );
     QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton );
 
-#ifndef BUTTONS_ON_TOOLBAR
-    d->tbPlay = new ToolButton( vbox1, tr( "Play" ), "mpegplayer/play", mediaPlayerState, SLOT(setPlaying(bool)), TRUE );
     QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
-#endif
     new ToolButton( vbox1, tr( "Move Up" ),   "mpegplayer/up",   d->selectedFiles, SLOT(moveSelectedUp()) );
     new ToolButton( vbox1, tr( "Remove" ),    "mpegplayer/cut",  d->selectedFiles, SLOT(removeSelected()) );
     new ToolButton( vbox1, tr( "Move Down" ), "mpegplayer/down", d->selectedFiles, SLOT(moveSelectedDown()) );
     QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch
-#ifndef BUTTONS_ON_TOOLBAR
-    d->tbShuffle = new ToolButton( vbox1, tr( "Randomize" ), "mpegplayer/shuffle", mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
-#endif
 
+    QWidget *aTab;
+    aTab = new QWidget( tabWidget, "aTab" );
+    audioView = new QListView( aTab, "Audioview" );
+    audioView->setMinimumSize(233,260);
+    audioView->addColumn( "Title",150);
+    audioView->addColumn("Size", 45);
+    audioView->addColumn("Media",35);
+    audioView->setColumnAlignment(1, Qt::AlignRight);
+    audioView->setColumnAlignment(2, Qt::AlignRight);
+    tabWidget->insertTab(aTab,"Audio");
+//    audioView
+     Global::findDocuments(&files, "audio/*");
+     QListIterator<DocLnk> dit( files.children() );
+     QString storage;
+     for ( ; dit.current(); ++dit ) {
+         QListViewItem * newItem;
+         if(dit.current()->file().find("/mnt/cf") != -1 ) storage="CF";
+         else if(dit.current()->file().find("/mnt/hda") != -1 ) storage="CF";
+         else if(dit.current()->file().find("/mnt/card") != -1 ) storage="SD";
+         else storage="RAM";
+         if ( QFile( dit.current()->file()).exists() ) {
+         newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), QString::number( QFile( dit.current()->file()).size() ), storage);
+         newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/musicfile" ));
+         }
+     }
+// videowidget
+     
+    QWidget *vTab;
+    vTab = new QWidget( tabWidget, "vTab" );
+    videoView = new QListView( vTab, "Videoview" );
+    videoView->setMinimumSize(233,260);
+    
+    videoView->addColumn("Title",150);
+    videoView->addColumn("Size",45);
+    videoView->addColumn("Media",35);
+    videoView->setColumnAlignment(1, Qt::AlignRight);
+    videoView->setColumnAlignment(2, Qt::AlignRight);
+
+    tabWidget->insertTab( vTab,"Video");
+
+    Global::findDocuments(&vFiles, "video/*");
+    QListIterator<DocLnk> Vdit( vFiles.children() );
+    for ( ; Vdit.current(); ++Vdit ) {
+         if( Vdit.current()->file().find("/mnt/cf") != -1 ) storage="CF";
+         else if( Vdit.current()->file().find("/mnt/hda") != -1 ) storage="CF";
+         else if( Vdit.current()->file().find("/mnt/card") != -1 ) storage="SD";
+         else storage="RAM";
+        QListViewItem * newItem;
+         if ( QFile( Vdit.current()->file()).exists() ) {
+        newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), QString::number( QFile( Vdit.current()->file()).size() ), storage);
+        newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/videofile" ));
+         }
+     }
     // add the library area
-    QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton );
+    QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
 
-    QLabel *libString = new QLabel( tr(" Media Library"), vbox4 );    
-    libString->setBackgroundMode( QButton::PaletteButton );
-    libString->setFont( QFont( "Helvetica", 8, QFont::Bold ) );
+//      connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
+//      connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
 
-    QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton );
-    d->files = new FileSelector( "video/*;audio/*", hbox6, "Find Media Files", FALSE, FALSE );
-    d->files->setBackgroundMode( PaletteButton );
-    QVBox *vbox7 = new QVBox( hbox6 ); vbox7->setBackgroundMode( PaletteButton );
+   connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
+   connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
+
+   connect( audioView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint&, int ) ),
+            this, SLOT( addToSelection( QListViewItem *, const QPoint&, int )) );
+   connect( videoView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint&, int ) ),
+            this, SLOT( addToSelection( QListViewItem *, const QPoint&, int )) );
 
-#ifdef SIDE_BUTTONS
-    new ToolButton( vbox7, tr( "Add to Playlist" ),      "mpegplayer/add_to_playlist",      d->selectedFiles, SLOT(addSelected()) );
-    new ToolButton( vbox7, tr( "Remove from Playlist" ), "mpegplayer/remove_from_playlist", d->selectedFiles, SLOT(removeSelected()) );
-    QVBox *stretch3 = new QVBox( vbox1 ); stretch3->setBackgroundMode( PaletteButton ); // add stretch
-#endif
 
-    connect( d->files, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) );
+   connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*)));
+  //   connect( d->files, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) );
+  //   connect( d->files, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) );
     connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ),    d->tbPlay,    SLOT( setOn( bool ) ) );
     connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ),    d->tbLoop,    SLOT( setOn( bool ) ) );
     connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ),   d->tbShuffle, SLOT( setOn( bool ) ) );
-    connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), d->tbFull,    SLOT( setOn( bool ) ) );
-    connect( mediaPlayerState, SIGNAL( scaledToggled( bool ) ),     d->tbScale,   SLOT( setOn( bool ) ) );
-    connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), d->tbScale,   SLOT( setEnabled( bool ) ) );
+
+//     connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), fullScreenButton,    SLOT( setOn( bool ) ) );
+//      connect( mediaPlayerState, SIGNAL( scaledToggled( bool ) ),     scaleButton,   SLOT( setEnabled( bool ) ) );
+//      connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), fullScreenButton,   SLOT( setEnabled( bool ) ) );
+
     connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ),   this,         SLOT( setPlaylist( bool ) ) );
 
+   connect( d->selectedFiles, SIGNAL( clicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
+//   connect( d->selectedFiles, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) );
+
     setCentralWidget( vbox5 );
 
     Config cfg( "MediaPlayer" );
     readConfig( cfg );
@@ -203,15 +278,16 @@ PlayListWidget::~PlayListWidget() {
 }
 
 
 void PlayListWidget::initializeStates() {
+
     d->tbPlay->setOn( mediaPlayerState->playing() );
     d->tbLoop->setOn( mediaPlayerState->looping() );
     d->tbShuffle->setOn( mediaPlayerState->shuffled() );
-    d->tbFull->setOn( mediaPlayerState->fullscreen() );
-    d->tbScale->setOn( mediaPlayerState->scaled() );
-    d->tbScale->setEnabled( mediaPlayerState->fullscreen() );
-    setPlaylist( mediaPlayerState->playlist() );
+//     d->tbFull->setOn( mediaPlayerState->fullscreen() );
+//     d->tbScale->setOn( mediaPlayerState->scaled() );
+//     d->tbScale->setEnabled( mediaPlayerState->fullscreen() );
+//    setPlaylist( mediaPlayerState->playlist() );
 }
 
 
 void PlayListWidget::readConfig( Config& cfg ) {
@@ -274,8 +350,18 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) {
 	mediaPlayerState->setPlaying( TRUE );
 }
 
 
+void PlayListWidget::addToSelection( QListViewItem *it ,const QPoint & p, int index) {
+    qDebug("add");
+//        d->selectedFiles->addToSelection( lnk );
+ //    }
+//     else
+//   mediaPlayerState->setPlaying( TRUE );
+//
+}
+
+
 void PlayListWidget::clearList() {
     while ( first() )
 	d->selectedFiles->removeSelected();
 }
@@ -446,4 +532,118 @@ void PlayListWidget::setView( char view ) {
     else
 	hide();
 }
 
+void PlayListWidget::addSelected() {
+//    QMessageBox::message("Note","Bozo the clown thinks\nthere's something actually here");
+    int tabPage=tabWidget->currentPageIndex();
+      switch (tabPage) {
+        case 0: //playlist
+          break;
+        case 1: { //audio
+            addToSelection( audioView->selectedItem() );
+                }           
+            break;
+        case 2: { // video
+            addToSelection( videoView->selectedItem() );
+                }
+            break;
+      };
+}
+
+void PlayListWidget::removeSelected() {
+    d->selectedFiles->removeSelected( );
+}
+
+
+void PlayListWidget::playIt( QListViewItem *it) {
+//   d->setDocumentUsed = FALSE;
+        mediaPlayerState->setPlaying(true);
+}
+
+void PlayListWidget::addToSelection( QListViewItem *it) {
+   d->setDocumentUsed = FALSE;
+    
+   if(it) {
+    qDebug("add to selection");
+    int tabPage=tabWidget->currentPageIndex();
+    switch (tabPage) {
+      case 1: {
+          QListIterator<DocLnk> dit( files.children() );
+          for ( ; dit.current(); ++dit ) {
+              if( dit.current()->name() == it->text(0)) {
+                  d->selectedFiles->addToSelection(  **dit );
+              }
+          }
+      }
+          break;
+      case 2: {
+          QListIterator<DocLnk> dit( vFiles.children() );
+          for ( ; dit.current(); ++dit ) {
+              qDebug(dit.current()->name());
+              if( dit.current()->name() == it->text(0)) {
+                  d->selectedFiles->addToSelection(  **dit );
+              }
+          }
+      }
+          break;
+      case 0:
+        break;
+    };
+    tabWidget->setCurrentPage(0);
+//        mediaPlayerState->setPlaying( TRUE );
+   }
+}
+
+void PlayListWidget::tabChanged(QWidget *widg) {
+
+    int tabPage=tabWidget->currentPageIndex();
+      switch (tabPage) {
+      case 0:
+      {
+           d->tbRemoveFromList->setEnabled(TRUE);
+           d->tbAddToList->setEnabled(FALSE);
+      }
+          break;
+        case 1:
+        {
+           d->tbRemoveFromList->setEnabled(FALSE);
+          d->tbAddToList->setEnabled(TRUE);
+        }
+            break;
+        case 2:
+        {
+          d->tbRemoveFromList->setEnabled(FALSE);
+          d->tbAddToList->setEnabled(TRUE);
+        }
+            break;
+      };
+}
+
+// void PlayListWidget::cancelMenuTimer() {
+//     if( menuTimer->isActive() )
+//     menuTimer->stop();
+// }
+
+// void PlayListWidget::showFileMenu() {
+
+// }
+
+// void PlayListWidget::contentsMousePressEvent( QMouseEvent * e )
+// {
+// //    QListView::contentsMousePressEvent( e );
+//     menuTimer->start( 750, TRUE );
+// }
+
+
+// void PlayListWidget::contentsMouseReleaseEvent( QMouseEvent * e )
+// {
+// //    QListView::contentsMouseReleaseEvent( e );
+//     menuTimer->stop();
+// }
+// // void PlayListWidget::setFullScreen() {
+//  mediaPlayerState->toggleFullscreen( );
+// }
+
+// void PlayListWidget::setScaled() {
+//  mediaPlayerState->toggleScaled();
+// }
diff --git a/core/multimedia/opieplayer/playlistwidget.h b/core/multimedia/opieplayer/playlistwidget.h
index 819adb1..5b05f11 100644
--- a/core/multimedia/opieplayer/playlistwidget.h
+++ b/core/multimedia/opieplayer/playlistwidget.h
@@ -1,8 +1,8 @@
 /**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of the Qtopia Environment.
+** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -21,27 +21,41 @@
 #define PLAY_LIST_WIDGET_H
 
 #include <qmainwindow.h>
 #include <qpe/applnk.h>
+#include <qtabwidget.h>
+/* #include <qtimer.h> */
 
 
 class PlayListWidgetPrivate;
 class Config;
-
+class QListViewItem;
+class QListView;
+class QPoint;
+class QAction;
+class QLabel;
 
 class PlayListWidget : public QMainWindow {
     Q_OBJECT
 public:
     PlayListWidget( QWidget* parent=0, const char* name=0, WFlags fl=0 );
     ~PlayListWidget();
-
+    QTabWidget * tabWidget;
+  QAction *fullScreenButton, *scaleButton;
+     DocLnkSet files;
+     DocLnkSet vFiles;
+     QListView *audioView, *videoView, *playlistView;
+     QLabel *libString; 
     // retrieve the current playlist entry (media file link)
     const DocLnk *current();
     void useSelectedDocument();
+/*     QTimer    * menuTimer; */
 
 public slots:
     void setDocument( const QString& fileref );
     void addToSelection( const DocLnk& ); // Add a media file to the playlist
+    void addToSelection( QListViewItem* ); // Add a media file to the playlist
+    void addToSelection( QListViewItem*, const QPoint&,int ); // Add a media file to the playlist
     void setActiveWindow(); // need to handle this to show the right view
     void setPlaylist( bool ); // Show/Hide the playlist
     void setView( char );
     void clearList(); 
@@ -49,18 +63,33 @@ public slots:
     void addAllMusicToList(); 
     void addAllVideoToList(); 
     void saveList();  // Save the playlist
     void loadList();  // Load a playlist
+    void playIt( QListViewItem *);
     bool first();
     bool last();
     bool next();
     bool prev();
+    void addSelected();
+    void removeSelected();
+    void tabChanged(QWidget*);
+/*     void setFullScreen(); */
+/*     void setScaled(); */
+protected:
+/*     void contentsMousePressEvent( QMouseEvent * e ); */
+/*     void contentsMouseReleaseEvent( QMouseEvent * e ); */
 
 private:
     void initializeStates();
     void readConfig( Config& cfg );
     void writeConfig( Config& cfg ) const;
     PlayListWidgetPrivate *d; // Private implementation data
+
+protected slots:
+/*     void cancelMenuTimer(); */
+/*     void showFileMenu(); */
+
+
 };
 
 
 #endif // PLAY_LIST_WIDGET_H
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index 12ae4fd..1f128a4 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -1,8 +1,8 @@
 /**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of the Qtopia Environment.
+** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -16,11 +16,10 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-
 #include <qpe/resource.h>
-#include <qpe/mediaplayerplugininterface.h>
+#include "mediaplayerplugininterface.h"
 #include <qwidget.h>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qslider.h>
@@ -66,9 +65,9 @@ static const int numButtons = (sizeof(videoButtons)/sizeof(MediaButton));
 
 
 VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
     QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
-    setCaption( tr("MediaPlayer") );
+    setCaption( tr("OpiePlayer") );
     setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
     pixmaps[0] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButton0a" ) );
     pixmaps[1] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButton0b" ) );
     pixmaps[2] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaControls0" ) );
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index bcbe7f2..a46b925 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -99,11 +99,13 @@ REQUIRES=
 
 ####### Compile
 
 wavplugin.o: wavplugin.cpp \
-		wavplugin.h
+		wavplugin.h \
+		../mediaplayerplugininterface.h
 
 wavpluginimpl.o: wavpluginimpl.cpp \
 		wavplugin.h \
+		../mediaplayerplugininterface.h \
 		wavpluginimpl.h