27 files changed, 1223 insertions, 973 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
@@ -136,6 +136,8 @@ REQUIRES=
 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 \
@@ -145,11 +147,13 @@ main.o: main.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
 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 \
@@ -165,10 +169,13 @@ playlistselection.o: playlistselection.cpp \
 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 \
@@ -176,6 +183,9 @@ mediaplayerstate.o: mediaplayerstate.cpp \
 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
@@ -188,6 +198,11 @@ 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 \
@@ -198,12 +213,15 @@ playlistwidget.o: playlistwidget.cpp \
 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 \
@@ -213,9 +231,10 @@ mediaplayer.o: mediaplayer.cpp \
 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 \
+                audiodevice.h
-                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 moc_loopcontrol.o: moc_loopcontrol.cpp \
                loopcontrol.h
@@ -241,7 +260,8 @@ 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,7 +1,7 @@
 /**********************************************************************
-** 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
@@ -17,8 +17,10 @@
 ** 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"
@@ -106,17 +108,18 @@ void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume
    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
@@ -126,13 +129,13 @@ void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume
 void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, bool muted ) {
    AudioDevicePrivate::muted = muted;
    if ( muted ) {
-        AudioDevicePrivate::leftVolume = leftVolume;
+  AudioDevicePrivate::leftVolume = leftVolume;
-        AudioDevicePrivate::rightVolume = rightVolume;
+  AudioDevicePrivate::rightVolume = rightVolume;
-        leftVolume = 0;
+  leftVolume = 0;
-        rightVolume = 0;
+  rightVolume = 0;
    } else {
        leftVolume  = ( (int) leftVolume < 0 ) ? 0 : ((  leftVolume > 0xFFFF ) ? 0xFFFF :  leftVolume );
-        rightVolume = ( (int)rightVolume < 0 ) ? 0 : (( rightVolume > 0xFFFF ) ? 0xFFFF : rightVolume );
+  rightVolume = ( (int)rightVolume < 0 ) ? 0 : (( rightVolume > 0xFFFF ) ? 0xFFFF : rightVolume );
    }
 #ifdef Q_OS_WIN32
    HWAVEOUT handle;
@@ -147,7 +150,7 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume,
    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
@@ -158,10 +161,12 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume,
    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
@@ -186,68 +191,47 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
    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 );
+        d->handle = ::open( "/dev/null", O_WRONLY );
    }
 #ifdef KEEP_DEVICE_OPEN 
-        AudioDevicePrivate::dspFd = d->handle;
+  AudioDevicePrivate::dspFd = d->handle;
    } else {
        d->handle = AudioDevicePrivate::dspFd;
    }
 #endif
-    ioctl( d->handle, SNDCTL_DSP_GETCAPS, &capabilities );
+    if(ioctl( d->handle, SNDCTL_DSP_GETCAPS, &capabilities )==-1)
-    ioctl( d->handle, SNDCTL_DSP_SETFRAGMENT, &fragments );
+        perror("ioctl(\"SNDCTL_DSP_GETCAPS\")");
-    ioctl( d->handle, SNDCTL_DSP_SETFMT, &format );
+    if(ioctl( d->handle, SNDCTL_DSP_SETFRAGMENT, &fragments )==-1)
-    ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency );
+        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;
+        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;
@@ -255,13 +239,12 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
    d->unwritten = 0;
    d->can_GETOSPACE = TRUE; // until we find otherwise
 
-            //if ( chs != d->channels )             qDebug( "Wanted %d, got %d channels", chs, d->channels );
+    //if ( chs != d->channels )       qDebug( "Wanted %d, got %d channels", chs, d->channels );
-            //if ( f != d->frequency )      qDebug( "wanted %dHz, got %dHz", f, d->frequency );
+    //if ( f != d->frequency )        qDebug( "wanted %dHz, got %dHz", f, d->frequency );
    //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
 }
    
@@ -270,7 +253,7 @@ AudioDevice::~AudioDevice() {
    waveOutClose( (HWAVEOUT)d->handle );
 #else
 # ifndef KEEP_DEVICE_OPEN 
-            close( d->handle );                 // Now it should be safe to shut the handle
+    close( d->handle );     // Now it should be safe to shut the handle
 # endif
    delete d->unwrittenBuffer;
    delete d;
@@ -297,15 +280,15 @@ void AudioDevice::write( char *buffer, unsigned int length )
    waveOutPrepareHeader( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) );
    // waveOutWrite returns immediately. the data is sent in the background. 
    if ( waveOutWrite( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ) )
-        qDebug( "failed to write block to audio device" );
+  qDebug( "failed to write block to audio device" );
    // emit completedIO();
 #else
    int t = ::write( d->handle, buffer, length );
    if ( t<0 ) t = 0;
    if ( t != (int)length) {
-        qDebug("Ahhh!! memcpys 1");
+  qDebug("Ahhh!! memcpys 1");
-        memcpy(d->unwrittenBuffer,buffer+t,length-t);
+  memcpy(d->unwrittenBuffer,buffer+t,length-t);
-        d->unwritten = length-t;
+  d->unwritten = length-t;
    }
 #endif
 }
@@ -341,27 +324,27 @@ unsigned int AudioDevice::canWrite() const
 #else
    audio_buf_info info;
    if ( d->can_GETOSPACE && ioctl(d->handle,SNDCTL_DSP_GETOSPACE,&info) ) {
-        d->can_GETOSPACE = FALSE;
+  d->can_GETOSPACE = FALSE;
-        fcntl( d->handle, F_SETFL, O_NONBLOCK );
+  fcntl( d->handle, F_SETFL, O_NONBLOCK );
    }
    if ( d->can_GETOSPACE ) {
-        int t = info.fragments * sound_fragment_bytes;
+  int t = info.fragments * sound_fragment_bytes;
-        return QMIN(t,(int)bufferSize());
+  return QMIN(t,(int)bufferSize());
    } else {
-        if ( d->unwritten ) {
+  if ( d->unwritten ) {
-            int t = ::write( d->handle, d->unwrittenBuffer, d->unwritten );
+      int t = ::write( d->handle, d->unwrittenBuffer, d->unwritten );
-            if ( t<0 ) t = 0;
+      if ( t<0 ) t = 0;
-            if ( (unsigned)t!=d->unwritten ) {
+      if ( (unsigned)t!=d->unwritten ) {
-                memcpy(d->unwrittenBuffer,d->unwrittenBuffer+t,d->unwritten-t);
+    memcpy(d->unwrittenBuffer,d->unwrittenBuffer+t,d->unwritten-t);
-                d->unwritten -= t;
+    d->unwritten -= t;
-            } else {
+      } else {
-                d->unwritten = 0;
+    d->unwritten = 0;
-            }
+      }
-        }
+  }
-        if ( d->unwritten )
+  if ( d->unwritten )
-            return 0;
+      return 0;
-        else
+  else
-            return d->bufferSize;
+      return d->bufferSize;
    }
 #endif
 }
@@ -371,15 +354,15 @@ int AudioDevice::bytesWritten() {
 #ifdef Q_OS_WIN32
    MMTIME pmmt = { TIME_BYTES, 0 };
    if ( ( waveOutGetPosition( (HWAVEOUT)d->handle, &pmmt, sizeof(MMTIME) ) != MMSYSERR_NOERROR ) || ( pmmt.wType != TIME_BYTES ) ) {
-        qDebug( "failed to get audio device position" );
+  qDebug( "failed to get audio device position" );
-        return -1;
+  return -1;
    }
    return pmmt.u.cb;
 #else
    int buffered = 0;
    if ( ioctl( d->handle, SNDCTL_DSP_GETODELAY, &buffered ) ) {
-        qDebug( "failed to get audio device position" );
+  qDebug( "failed to get audio device position" );
-        return -1;
+  return -1;
    }
    return buffered;
 #endif
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,7 +1,7 @@
 /**********************************************************************
-** 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
@@ -17,10 +17,14 @@
 ** 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;
@@ -29,7 +33,7 @@ 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;
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,7 +1,7 @@
 /**********************************************************************
-** 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
@@ -60,7 +60,7 @@ 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" ) );
@@ -103,7 +103,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
 AudioWidget::~AudioWidget() {
    for ( int i = 0; i < 4; i++ )
-        delete pixmaps[i];
+  delete pixmaps[i];
 }
@@ -118,7 +118,7 @@ void AudioWidget::sliderPressed() {
 void AudioWidget::sliderReleased() {
    audioSliderBeingMoved = FALSE;
    if ( slider->width() == 0 )
-        return;
+  return;
    long val = long((double)slider->value() * mediaPlayerState->length() / slider->width());
    mediaPlayerState->setPosition( val );
 }
@@ -136,34 +136,34 @@ void AudioWidget::setLength( long max ) {
 void AudioWidget::setView( char view ) {
    if ( view == 'a' ) {
-        startTimer( 150 );
+  startTimer( 150 );
-        showMaximized();
+  showMaximized();
    } else {
-        killTimers();
+  killTimers();
-        hide();
+  hide();
    }
 }
 void AudioWidget::updateSlider( long i, long max ) {
    if ( max == 0 )
-        return;
+  return;
    // Will flicker too much if we don't do this
    // Scale to something reasonable 
    int width = slider->width();
    int val = int((double)i * width / max);
    if ( !audioSliderBeingMoved ) {
-        if ( slider->value() != val )
+  if ( slider->value() != val )
-            slider->setValue( val );
+      slider->setValue( val );
-        if ( slider->maxValue() != width )
+  if ( slider->maxValue() != width )
-            slider->setMaxValue( width );
+      slider->setMaxValue( width );
    }
 }
 void AudioWidget::setToggleButton( int i, bool down ) {
    if ( down != audioButtons[i].isDown )
-        toggleButton( i );
+  toggleButton( i );
 }
@@ -187,61 +187,61 @@ void AudioWidget::paintButton( QPainter *p, int i ) {
 void AudioWidget::timerEvent( QTimerEvent * ) {
    static int frame = 0;
    if ( !mediaPlayerState->paused() && audioButtons[ AudioPlay ].isDown ) {
-        frame = frame >= 7 ? 0 : frame + 1;
+  frame = frame >= 7 ? 0 : frame + 1;
-        int x = audioButtons[AudioPlay].xPos;
+  int x = audioButtons[AudioPlay].xPos;
-        int y = audioButtons[AudioPlay].yPos;
+  int y = audioButtons[AudioPlay].yPos;
-        QPainter p( this );
+  QPainter p( this );
-        // Optimize to only draw the little bit of the changing images which is different
+  // Optimize to only draw the little bit of the changing images which is different
-        p.drawPixmap( x + 14, y +  8, *pixmaps[3], 32 * frame, 0, 32, 32 );
+  p.drawPixmap( x + 14, y +  8, *pixmaps[3], 32 * frame, 0, 32, 32 );
-        p.drawPixmap( x + 37, y + 37, *pixmaps[2], 18 * AudioPlay, 0, 6, 3 );
+  p.drawPixmap( x + 37, y + 37, *pixmaps[2], 18 * AudioPlay, 0, 6, 3 );
    }
 }
 void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
    for ( int i = 0; i < numButtons; i++ ) {
-        int size = audioButtons[i].isBig;
+  int size = audioButtons[i].isBig;
-        int x = audioButtons[i].xPos;
+  int x = audioButtons[i].xPos;
-        int y = audioButtons[i].yPos;
+  int y = audioButtons[i].yPos;
-        if ( event->state() == QMouseEvent::LeftButton ) {
+  if ( event->state() == QMouseEvent::LeftButton ) {
-            // The test to see if the mouse click is inside the circular button or not
+      // The test to see if the mouse click is inside the circular button or not
-            // (compared with the radius squared to avoid a square-root of our distance)
+      // (compared with the radius squared to avoid a square-root of our distance)
-            int radius = 32 + 13 * size;
+      int radius = 32 + 13 * size;
-            QPoint center = QPoint( x + radius, y + radius );
+      QPoint center = QPoint( x + radius, y + radius );
-            QPoint dXY = center - event->pos();
+      QPoint dXY = center - event->pos();
-            int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y();
+      int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y();
-            bool isOnButton = dist <= (radius * radius);
+      bool isOnButton = dist <= (radius * radius);
-        //    QRect r( x, y, 64 + 22*size, 64 + 22*size );
+//      QRect r( x, y, 64 + 22*size, 64 + 22*size );
-        //    bool isOnButton = r.contains( event->pos() ); // Rectangular Button code
+//      bool isOnButton = r.contains( event->pos() ); // Rectangular Button code
-            if ( isOnButton && !audioButtons[i].isHeld ) {
+      if ( isOnButton && !audioButtons[i].isHeld ) {
-                audioButtons[i].isHeld = TRUE;
+    audioButtons[i].isHeld = TRUE;
-                toggleButton(i);
+    toggleButton(i);
-                switch (i) {
+    switch (i) {
                    case AudioVolumeUp:   emit moreClicked(); return;
                    case AudioVolumeDown: emit lessClicked(); return;
-                }
+    }
-            } else if ( !isOnButton && audioButtons[i].isHeld ) {
+      } else if ( !isOnButton && audioButtons[i].isHeld ) {
-                audioButtons[i].isHeld = FALSE;
+    audioButtons[i].isHeld = FALSE;
-                toggleButton(i);
+    toggleButton(i);
-            }
+      }
-        } else {
+  } else {
-            if ( audioButtons[i].isHeld ) {
+      if ( audioButtons[i].isHeld ) {
-                audioButtons[i].isHeld = FALSE;
+    audioButtons[i].isHeld = FALSE;
-                if ( !audioButtons[i].isToggle )
+    if ( !audioButtons[i].isToggle )
-                    setToggleButton( i, FALSE );
+        setToggleButton( i, FALSE );
-                switch (i) {
+    switch (i) {
-                    case AudioPlay:       mediaPlayerState->setPlaying(audioButtons[i].isDown); return;
+        case AudioPlay:       mediaPlayerState->setPlaying(audioButtons[i].isDown); return;
-                    case AudioStop:       mediaPlayerState->setPlaying(FALSE); return;
+        case AudioStop:       mediaPlayerState->setPlaying(FALSE); return;
-                    case AudioPause:      mediaPlayerState->setPaused(audioButtons[i].isDown); return;
+        case AudioPause:      mediaPlayerState->setPaused(audioButtons[i].isDown); return;
-                    case AudioNext:       mediaPlayerState->setNext(); return;
+        case AudioNext:       mediaPlayerState->setNext(); return;
-                    case AudioPrevious:   mediaPlayerState->setPrev(); return;
+        case AudioPrevious:   mediaPlayerState->setPrev(); return;
-                    case AudioLoop:       mediaPlayerState->setLooping(audioButtons[i].isDown); return;
+        case AudioLoop:       mediaPlayerState->setLooping(audioButtons[i].isDown); return;
-                    case AudioVolumeUp:   emit moreReleased(); return;
+        case AudioVolumeUp:   emit moreReleased(); return;
-                    case AudioVolumeDown: emit lessReleased(); return;
+        case AudioVolumeDown: emit lessReleased(); return;
-                    case AudioPlayList:   mediaPlayerState->setList();  return;
+        case AudioPlayList:   mediaPlayerState->setList();  return;
-                }
+    }
-            }
+      }
-        }
+  }
    }
 }
@@ -270,7 +270,7 @@ void AudioWidget::closeEvent( QCloseEvent* ) {
 void AudioWidget::paintEvent( QPaintEvent * ) {
    QPainter p( this );
    for ( int i = 0; i < numButtons; i++ )
-        paintButton( &p, i );
+  paintButton( &p, i );
 }
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,7 +1,7 @@
 /**********************************************************************
-** 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
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
@@ -214,10 +214,12 @@ huffman.o: huffman.c \
 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
@@ -1,12 +1,12 @@
-        TEMPLATE=   lib
+TEMPLATE  =   lib
-        CONFIG  +=  qt warn_on release
+CONFIG    +=  qt warn_on release
-        HEADERS         =   libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \
+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
+        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 \
+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
+        layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp
-        TARGET  =   madplugin
+TARGET    =   madplugin
-        DESTDIR         =   ../../plugins/codecs
+DESTDIR   =   ../../plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe -lm
-        VERSION         =   1.0.0
+VERSION   =   1.0.0
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
@@ -47,7 +47,7 @@ extern "C" {
 #define MPEG_BUFFER_SIZE    65536
-        //#define debugMsg(a)    qDebug(a)
+//#define debugMsg(a)     qDebug(a)
 #define debugMsg(a)
@@ -145,7 +145,7 @@ bool LibMadPlugin::isFileSupported( const QString& path ) {
    debugMsg( "LibMadPlugin::isFileSupported" );
    // Mpeg file extensions
-            //"mp2","mp3","m1v","m2v","m2s","mpg","vob","mpeg","ac3"
+    //  "mp2","mp3","m1v","m2v","m2s","mpg","vob","mpeg","ac3"
    // Other media extensions
    //  "wav","mid","mod","s3m","ogg","avi","mov","sid"
@@ -153,10 +153,10 @@ bool LibMadPlugin::isFileSupported( const QString& path ) {
    // Test file extension
    if ( ext ) {
-        if ( strncasecmp(ext, ".mp2", 4) == 0 )
+  if ( strncasecmp(ext, ".mp2", 4) == 0 )
-            return TRUE;
+      return TRUE;
-        if ( strncasecmp(ext, ".mp3", 4) == 0 )
+  if ( strncasecmp(ext, ".mp3", 4) == 0 )
-            return TRUE;
+      return TRUE;
    }
    return FALSE;
@@ -176,7 +176,7 @@ bool LibMadPlugin::open( const QString& path ) {
    d->input.fd = ::open( d->input.path, O_RDONLY );
    if (d->input.fd == -1) {
        qDebug("error opening %s", d->input.path );
-        return FALSE;
+  return FALSE;
    }
    printID3Tags();
@@ -184,25 +184,25 @@ bool LibMadPlugin::open( const QString& path ) {
 #if defined(HAVE_MMAP)
    struct stat stat;
    if (fstat(d->input.fd, &stat) == -1) {
-        qDebug("error calling fstat"); return FALSE;
+  qDebug("error calling fstat"); return FALSE;
    }
    if (S_ISREG(stat.st_mode) && stat.st_size > 0) {
-        d->input.length = stat.st_size;
+  d->input.length = stat.st_size;
-        d->input.fdm = map_file(d->input.fd, &d->input.length);
+  d->input.fdm = map_file(d->input.fd, &d->input.length);
-        if (d->input.fdm == 0) {
+  if (d->input.fdm == 0) {
-            qDebug("error mmapping file"); return FALSE;
+      qDebug("error mmapping file"); return FALSE;
-        }
+  }
-        d->input.data = (unsigned char *)d->input.fdm;
+  d->input.data = (unsigned char *)d->input.fdm;
    }
 #endif
    if (d->input.data == 0) {
-        d->input.data = (unsigned char *)malloc(MPEG_BUFFER_SIZE);
+  d->input.data = (unsigned char *)malloc(MPEG_BUFFER_SIZE);
-        if (d->input.data == 0) {
+  if (d->input.data == 0) {
-            qDebug("error allocating input buffer");
+      qDebug("error allocating input buffer");
-            return FALSE;
+      return FALSE;
-        }
+  }
-        d->input.length = 0;
+  d->input.length = 0;
    }
    d->input.eof = 0;
@@ -226,23 +226,23 @@ bool LibMadPlugin::close() {
 #if defined(HAVE_MMAP)
    if (d->input.fdm) {
-        if (unmap_file(d->input.fdm, d->input.length) == -1) {
+  if (unmap_file(d->input.fdm, d->input.length) == -1) {
-            qDebug("error munmapping file");
+      qDebug("error munmapping file");
-            result = FALSE;
+      result = FALSE;
-        }
+  }
-        d->input.fdm  = 0;
+  d->input.fdm  = 0;
-        d->input.data = 0;
+  d->input.data = 0;
    }
 #endif
    if (d->input.data) {
        free(d->input.data);
-        d->input.data = 0;
+  d->input.data = 0;
    }
    if (::close(d->input.fd) == -1) {
        qDebug("error closing file %s", d->input.path);
-        result = FALSE;
+  result = FALSE;
    }
    d->input.fd = 0;
@@ -323,70 +323,70 @@ bool LibMadPlugin::read() {
    int len;
      if (d->input.eof)
-        return FALSE;
+  return FALSE;
 #if defined(HAVE_MMAP)
      if (d->input.fdm) {
-        unsigned long skip = 0;
+  unsigned long skip = 0;
-        if (d->stream.next_frame) {
+  if (d->stream.next_frame) {
-          struct stat stat;
+    struct stat stat;
-          if (fstat(d->input.fd, &stat) == -1)
+    if (fstat(d->input.fd, &stat) == -1)
-            return FALSE;
+      return FALSE;
-          if (stat.st_size + MAD_BUFFER_GUARD <= (signed)d->input.length)
+    if (stat.st_size + MAD_BUFFER_GUARD <= (signed)d->input.length)
-            return FALSE;
+      return FALSE;
-          // file size changed; update memory map
+    // file size changed; update memory map
-          skip = d->stream.next_frame - d->input.data;
+    skip = d->stream.next_frame - d->input.data;
-          if (unmap_file(d->input.fdm, d->input.length) == -1) {
+    if (unmap_file(d->input.fdm, d->input.length) == -1) {
-            d->input.fdm  = 0;
+      d->input.fdm  = 0;
-            d->input.data = 0;
+      d->input.data = 0;
-            return FALSE;
+      return FALSE;
-          }
+    }
-          d->input.length = stat.st_size;
+    d->input.length = stat.st_size;
-          d->input.fdm = map_file(d->input.fd, &d->input.length);
+    d->input.fdm = map_file(d->input.fd, &d->input.length);
-          if (d->input.fdm == 0) {
+    if (d->input.fdm == 0) {
-            d->input.data = 0;
+      d->input.data = 0;
-            return FALSE;
+      return FALSE;
-          }
+    }
-          d->input.data = (unsigned char *)d->input.fdm;
+    d->input.data = (unsigned char *)d->input.fdm;
-        }
+  }
-        mad_stream_buffer(&d->stream, d->input.data + skip, d->input.length - skip);
+  mad_stream_buffer(&d->stream, d->input.data + skip, d->input.length - skip);
      } else
 #endif
      {
-        if (d->stream.next_frame) {
+  if (d->stream.next_frame) {
-          memmove(d->input.data, d->stream.next_frame,
+    memmove(d->input.data, d->stream.next_frame,
-                d->input.length = &d->input.data[d->input.length] - d->stream.next_frame);
+    d->input.length = &d->input.data[d->input.length] - d->stream.next_frame);
-        }
+  }
-        do {
+  do {
-          len = ::read(d->input.fd, d->input.data + d->input.length, MPEG_BUFFER_SIZE - d->input.length);
+    len = ::read(d->input.fd, d->input.data + d->input.length, MPEG_BUFFER_SIZE - d->input.length);
-        }
+  }
-        while (len == -1 && errno == EINTR);
+  while (len == -1 && errno == EINTR);
-        if (len == -1) {
+  if (len == -1) {
-          qDebug("error reading audio");
+    qDebug("error reading audio");
-          return FALSE;
+    return FALSE;
-        }
+  }
-        else if (len == 0) {
+  else if (len == 0) {
-          d->input.eof = 1;
+    d->input.eof = 1;
-          assert(MPEG_BUFFER_SIZE - d->input.length >= MAD_BUFFER_GUARD);
+    assert(MPEG_BUFFER_SIZE - d->input.length >= MAD_BUFFER_GUARD);
-          while (len < MAD_BUFFER_GUARD)
+    while (len < MAD_BUFFER_GUARD)
-            d->input.data[d->input.length + len++] = 0;
+      d->input.data[d->input.length + len++] = 0;
-        }
+  }
-        mad_stream_buffer(&d->stream, d->input.data, d->input.length += len);
+  mad_stream_buffer(&d->stream, d->input.data, d->input.length += len);
      }
    return TRUE;
@@ -411,16 +411,16 @@ inline long audio_linear_dither( mad_fixed_t sample, mad_fixed_t& error )
 inline void audio_pcm( short *data, unsigned int nsamples, mad_fixed_t *left, mad_fixed_t *right )
 {
    if ( right ) {
-        while (nsamples--) {
+  while (nsamples--) {
-            data[0] = audio_linear_dither( *left++,  left_err );
+      data[0] = audio_linear_dither( *left++,  left_err );
-            data[1] = audio_linear_dither( *right++, right_err );
+      data[1] = audio_linear_dither( *right++, right_err );
-            data += 2;
+      data += 2;
-        }
+  }
    } else {
-        while (nsamples--) {
+  while (nsamples--) {
-            data[0] = data[1] = audio_linear_dither( *left++,  left_err );
+      data[0] = data[1] = audio_linear_dither( *left++,  left_err );
-            data += 2;
+      data += 2;
-        }
+  }
    }
 }
@@ -436,36 +436,36 @@ bool LibMadPlugin::decode( short *output, long samples, long& samplesMade ) {
    static int maxBuffered = 8000; // 65536;
    if ( samples > maxBuffered )
-        samples = maxBuffered;
+  samples = maxBuffered;
    if ( d->flush ) {
-        buffered = 0;
+  buffered = 0;
-        offset = 0;
+  offset = 0;
-        d->flush = FALSE;
+  d->flush = FALSE;
    }
    while ( buffered < maxBuffered ) {
-        while (mad_frame_decode(&d->frame, &d->stream) == -1) {
+  while (mad_frame_decode(&d->frame, &d->stream) == -1) {
-            if (!MAD_RECOVERABLE(d->stream.error)) {
+      if (!MAD_RECOVERABLE(d->stream.error)) {
-                debugMsg( "feed me" );
+    debugMsg( "feed me" );
-                return FALSE; // Feed me
+    return FALSE; // Feed me
-            }
+      }
-            if ( d->stream.error == MAD_ERROR_BADCRC ) {
+      if ( d->stream.error == MAD_ERROR_BADCRC ) {
-                mad_frame_mute(&d->frame);
+    mad_frame_mute(&d->frame);
-                qDebug( "error decoding, bad crc" );
+    qDebug( "error decoding, bad crc" );
-            }
+      }
-        }
+  }
-        mad_synth_frame(&d->synth, &d->frame);
+  mad_synth_frame(&d->synth, &d->frame);
-        int decodedSamples = d->synth.pcm.length;
+  int decodedSamples = d->synth.pcm.length;
-        memcpy( &(buffer[0][offset]), d->synth.pcm.samples[0], decodedSamples * sizeof(mad_fixed_t) );
+  memcpy( &(buffer[0][offset]), d->synth.pcm.samples[0], decodedSamples * sizeof(mad_fixed_t) );
-        if ( d->synth.pcm.channels == 2 )
+  if ( d->synth.pcm.channels == 2 )
-            memcpy( &(buffer[1][offset]), d->synth.pcm.samples[1], decodedSamples * sizeof(mad_fixed_t) );
+      memcpy( &(buffer[1][offset]), d->synth.pcm.samples[1], decodedSamples * sizeof(mad_fixed_t) );
-        offset += decodedSamples;
+  offset += decodedSamples;
-        buffered += 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] );
@@ -493,32 +493,32 @@ bool LibMadPlugin::audioReadSamples( short *output, int /*channels*/, long sampl
    static bool needInput = TRUE;
    
    if ( samples == 0 )
-        return FALSE;
+  return FALSE;
    do {
-        if ( needInput )
+  if ( needInput )
-            if ( !read() ) {
+      if ( !read() ) {
-        //      if ( d->input.eof )
+//    if ( d->input.eof )
-        //          needInput = FALSE;
+//        needInput = FALSE;
-        //      else
+//    else
-                    return FALSE;
+        return FALSE;
-            }
+      }
-        needInput = FALSE;
+  needInput = FALSE;
-        if ( decode( output, samples, samplesMade ) )
+  if ( decode( output, samples, samplesMade ) )
-            return TRUE;
+      return TRUE;
-        else
+  else
-            needInput = TRUE;
+      needInput = TRUE;
    }
    while ( ( samplesMade < samples ) && ( !d->input.eof ) );
 /*
    static bool firstTimeThru = TRUE;
    if ( firstTimeThru ) {
-        firstTimeThru = FALSE;
+  firstTimeThru = FALSE;
-        decode( output, samples, samplesMade );
+  decode( output, samples, samplesMade );
-        return FALSE;
+  return FALSE;
    } else
 */
        return FALSE;
@@ -537,41 +537,41 @@ void LibMadPlugin::printID3Tags() {
    char id3v1[128 + 1];
    if ( ::lseek( d->input.fd, -128, SEEK_END ) == -1 ) {
-        qDebug( "error seeking to id3 tags" );
+  qDebug( "error seeking to id3 tags" );
-        return;
+  return;
    }
    if ( ::read( d->input.fd, id3v1, 128 ) != 128 ) {
-        qDebug( "error reading in id3 tags" );
+  qDebug( "error reading in id3 tags" );
-        return;
+  return;
    }
    if ( ::strncmp( (const char *)id3v1, "TAG", 3 ) != 0 ) {
-        debugMsg( "sorry, no id3 tags" );
+  debugMsg( "sorry, no id3 tags" );
    } else {
-        int len[5] = { 30, 30, 30, 4, 30 };
+  int len[5] = { 30, 30, 30, 4, 30 };
-        QString label[5] = { tr( "Title" ), tr( "Artist" ), tr( "Album" ), tr( "Year" ), tr( "Comment" ) };
+  QString label[5] = { tr( "Title" ), tr( "Artist" ), tr( "Album" ), tr( "Year" ), tr( "Comment" ) };
-        char *ptr = id3v1 + 3, *ptr2 = ptr + len[0];
+  char *ptr = id3v1 + 3, *ptr2 = ptr + len[0];
-        qDebug( "ID3 tags in file:" );
+  qDebug( "ID3 tags in file:" );
-        info = "";
+  info = "";
-        for ( int i = 0; i < 5; ptr += len[i], i++, ptr2 += len[i] ) {
+  for ( int i = 0; i < 5; ptr += len[i], i++, ptr2 += len[i] ) {
-            char push = *ptr2;
+      char push = *ptr2;
-            *ptr2 = '\0';
+      *ptr2 = '\0';
-            char *ptr3 = ptr2;
+      char *ptr3 = ptr2;
-            while ( ptr3-1 >= ptr && isspace(ptr3[-1]) ) ptr3--;
+      while ( ptr3-1 >= ptr && isspace(ptr3[-1]) ) ptr3--;
-            char push2 = *ptr3; *ptr3 = '\0';
+      char push2 = *ptr3; *ptr3 = '\0';
-            if ( strcmp( ptr, "" ) )
+      if ( strcmp( ptr, "" ) )
-                info += ( i != 0 ? ", " : "" ) + label[i] + ": " + ptr;
+    info += ( i != 0 ? ", " : "" ) + label[i] + ": " + ptr;
-            //qDebug( info.latin1() );
+      //qDebug( info.latin1() );
-            *ptr3 = push2;
+      *ptr3 = push2;
-            *ptr2 = push;
+      *ptr2 = push;
-        }
+  }
-        if (id3v1[126] == 0 && id3v1[127] != 0)
+  if (id3v1[126] == 0 && id3v1[127] != 0)
-            info += tr( ", Track: " ) + id3v1[127];
+      info += tr( ", Track: " ) + id3v1[127];
    }
    if ( ::lseek(d->input.fd, 0, SEEK_SET) == -1 ) {
-        qDebug( "error seeking back to beginning" );
+  qDebug( "error seeking back to beginning" );
        return;
    }
 }
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
@@ -21,7 +21,8 @@
 #define LIBMAD_PLUGIN_H
 #include <qstring.h>
-#include <qpe/mediaplayerplugininterface.h>
+//#include <qpe/mediaplayerplugininterface.h>
+#include "../mediaplayerplugininterface.h"
 // #define OLD_MEDIAPLAYER_API
@@ -52,6 +53,7 @@ public:
    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 );
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
@@ -20,7 +20,8 @@
 #ifndef LIBMAD_PLUGIN_IMPL_H 
 #define LIBMAD_PLUGIN_IMPL_H
-#include <qpe/mediaplayerplugininterface.h>
+//#include <qpe/mediaplayerplugininterface.h>
+#include "../mediaplayerplugininterface.h"
 class LibMadPlugin;
@@ -41,7 +42,6 @@ public:
    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
@@ -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
+TEMPLATE  =   lib
-        CONFIG  +=  qt warn_on release
+CONFIG    +=  qt warn_on release
-        HEADERS         =   libmpeg3plugin.h   libmpeg3pluginimpl.h
+HEADERS   =   libmpeg3plugin.h   libmpeg3pluginimpl.h
-        SOURCES         =   libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
+SOURCES   =   libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
-                    bitstream.c \
+        bitstream.c \
-                    libmpeg3.c \
+        libmpeg3.c \
-                    mpeg3atrack.c \
+        mpeg3atrack.c \
-                    mpeg3css.c \
+        mpeg3css.c \
-                    mpeg3demux.c \
+        mpeg3demux.c \
-                    mpeg3io.c \
+        mpeg3io.c \
-                    mpeg3title.c \
+        mpeg3title.c \
-                    mpeg3vtrack.c \
+        mpeg3vtrack.c \
-                    audio/ac3.c \
+        audio/ac3.c \
-                    audio/bit_allocation.c \
+        audio/bit_allocation.c \
-                    audio/dct.c \
+        audio/dct.c \
-                    audio/exponents.c \
+        audio/exponents.c \
-                    audio/header.c \
+        audio/header.c \
-                    audio/layer2.c \
+        audio/layer2.c \
-                    audio/layer3.c \
+        audio/layer3.c \
-                    audio/mantissa.c \
+        audio/mantissa.c \
-                    audio/mpeg3audio.c \
+        audio/mpeg3audio.c \
-                    audio/pcm.c \
+        audio/pcm.c \
-                    audio/synthesizers.c \
+        audio/synthesizers.c \
-                    audio/tables.c \
+        audio/tables.c \
-                    video/getpicture.c \
+        video/getpicture.c \
-                    video/headers.c \
+        video/headers.c \
-                    video/idct.c \
+        video/idct.c \
-                    video/macroblocks.c \
+        video/macroblocks.c \
-                    video/mmxtest.c \
+        video/mmxtest.c \
-                    video/motion.c \
+        video/motion.c \
-                    video/mpeg3video.c \
+        video/mpeg3video.c \
-                    video/output.c \
+        video/output.c \
-                    video/reconstruct.c \
+        video/reconstruct.c \
-                    video/seek.c \
+        video/seek.c \
-                    video/slice.c \
+        video/slice.c \
-                    video/vlc.c
+        video/vlc.c
-        TARGET  =   mpeg3plugin
+TARGET    =   mpeg3plugin
-        DESTDIR         =   ../../plugins/codecs
+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;
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,7 +1,7 @@
 /**********************************************************************
-** 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
@@ -17,12 +17,14 @@
 ** 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>
@@ -32,6 +34,7 @@
 #include "loopcontrol.h"
 #include "videowidget.h"
 #include "audiodevice.h"
+#include "mediaplayerplugininterface.h"
 #include "mediaplayerstate.h"
@@ -43,13 +46,13 @@ extern MediaPlayerState *mediaPlayerState;
 #define DecodeLoopDebug(x)
-        static char    *audioBuffer = NULL;
+static char     *audioBuffer = NULL;
 static AudioDevice  *audioDevice = NULL;
-        static bool    disabledSuspendScreenSaver = FALSE;
+static bool     disabledSuspendScreenSaver = FALSE;
-        static bool    previousSuspendMode = FALSE;
+static bool     previousSuspendMode = FALSE;
-        pthread_taudio_tid;
+pthread_t audio_tid;
 pthread_attr_t  audio_attr;
 bool threadOkToGo = FALSE;
@@ -57,22 +60,22 @@ bool threadOkToGo = FALSE;
 class Mutex {
 public:
    Mutex() {
-        pthread_mutexattr_t attr;
+  pthread_mutexattr_t attr;
-        pthread_mutexattr_init( &attr );
+  pthread_mutexattr_init( &attr );
-        pthread_mutex_init( &mutex, &attr );
+  pthread_mutex_init( &mutex, &attr );
-        pthread_mutexattr_destroy( &attr );
+  pthread_mutexattr_destroy( &attr );
    }
    ~Mutex() {
-        pthread_mutex_destroy( &mutex );
+  pthread_mutex_destroy( &mutex );
    }
    void lock() {
-        pthread_mutex_lock( &mutex );
+  pthread_mutex_lock( &mutex );
    }
    void unlock() {
-        pthread_mutex_unlock( &mutex );
+  pthread_mutex_unlock( &mutex );
    }
 private:
    pthread_mutex_t mutex;
@@ -82,10 +85,10 @@ private:
 void *startAudioThread( void *ptr ) {
    LoopControl *mpegView = (LoopControl *)ptr;
    while ( TRUE ) {
-        if ( threadOkToGo && mpegView->moreAudio )
+  if ( threadOkToGo && mpegView->moreAudio )
-            mpegView->startAudio();
+      mpegView->startAudio();
-        else
+  else
-            usleep( 10000 ); // Semi-buzy-wait till we are playing again
+      usleep( 10000 ); // Semi-buzy-wait till we are playing again
    }
    return 0;
 }
@@ -102,24 +105,19 @@ LoopControl::LoopControl( QObject *parent, const char *name )
    audioMutex = new Mutex;
    pthread_attr_init(&audio_attr);
+#define USE_REALTIME_AUDIO_THREAD
-    if ( getuid() == 0 ) {
+#ifdef USE_REALTIME_AUDIO_THREAD
-        printf("true, guid = %i\n", getuid());
+    // Attempt to set it to real-time round robin
+    if ( pthread_attr_setschedpolicy( &audio_attr, SCHED_RR ) == 0 ) {
-        // Attempt to set it to real-time round robin
+  sched_param params;
-        if ( pthread_attr_setschedpolicy( &audio_attr, SCHED_RR ) == 0 ) {
+  params.sched_priority = 50;
-            sched_param params;
+  pthread_attr_setschedparam(&audio_attr,&params);
-            params.sched_priority = 50;
+    } else {
-            pthread_attr_setschedparam(&audio_attr,&params);
+  qDebug( "Error setting up a realtime thread, reverting to using a normal thread." );
-        } else {
+  pthread_attr_destroy(&audio_attr);
-            qDebug( "Error setting up a realtime thread, reverting to using a normal thread." );
+  pthread_attr_init(&audio_attr);
-            pthread_attr_destroy(&audio_attr);
-            pthread_attr_init(&audio_attr);
-        }
    }
-//    printf("false, guid = %i\n", getuid());
+#endif
-    usleep( 100 );
    pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this);
 }
@@ -136,14 +134,14 @@ static int currentSample = 0;
 void LoopControl::timerEvent( QTimerEvent *te ) {
    if ( te->timerId() == videoId )
-        startVideo();
+  startVideo();
    if ( te->timerId() == sliderId ) {
-        if ( hasAudioChannel && !hasVideoChannel && moreAudio ) {
+  if ( hasAudioChannel && !hasVideoChannel && moreAudio ) {
-            mediaPlayerState->updatePosition( audioSampleCounter );
+      mediaPlayerState->updatePosition( audioSampleCounter );
-        } else if ( hasVideoChannel && moreVideo ) {
+  } else if ( hasVideoChannel && moreVideo ) {
-            mediaPlayerState->updatePosition( current_frame );
+      mediaPlayerState->updatePosition( current_frame );
-        }
+  }
    }
    if ( !moreVideo && !moreAudio ) { 
@@ -157,26 +155,26 @@ void LoopControl::setPosition( long pos ) {
    audioMutex->lock();
    if ( hasVideoChannel && hasAudioChannel ) {
-        playtime.restart();
+  playtime.restart();
-        playtime = playtime.addMSecs( long((double)-pos * 1000.0 / framerate) );
+  playtime = playtime.addMSecs( long((double)-pos * 1000.0 / framerate) );
-        current_frame = pos + 1;
+  current_frame = pos + 1;
-        mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
+  mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
-        prev_frame = current_frame - 1;
+  prev_frame = current_frame - 1;
-        currentSample = (int)( (double)current_frame * freq / framerate );
+  currentSample = (int)( (double)current_frame * freq / framerate );
-        mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream );
+  mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream );
-        audioSampleCounter = currentSample - 1;
+  audioSampleCounter = currentSample - 1;
    } else if ( hasVideoChannel ) {
-        playtime.restart();
+  playtime.restart();
-        playtime = playtime.addMSecs( long((double)-pos * 1000.0 / framerate) );
+  playtime = playtime.addMSecs( long((double)-pos * 1000.0 / framerate) );
-        current_frame = pos + 1;
+  current_frame = pos + 1;
-        mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
+  mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
-        prev_frame = current_frame - 1;
+  prev_frame = current_frame - 1;
    } else if ( hasAudioChannel ) {
-        playtime.restart();
+  playtime.restart();
-        playtime = playtime.addMSecs( long((double)-pos * 1000.0 / freq) );
+  playtime = playtime.addMSecs( long((double)-pos * 1000.0 / freq) );
-        currentSample = pos + 1;
+  currentSample = pos + 1;
-        mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream );
+  mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream );
-        audioSampleCounter = currentSample - 1;
+  audioSampleCounter = currentSample - 1;
    }
    audioMutex->unlock();
@@ -189,32 +187,32 @@ void LoopControl::startVideo() {
        if ( mediaPlayerState->curDecoder() ) {
-            if ( hasAudioChannel && !isMuted ) {
+      if ( hasAudioChannel && !isMuted ) {
-                current_frame = long( playtime.elapsed() * framerate / 1000 );
+    current_frame = long( playtime.elapsed() * framerate / 1000 );
-                if ( prev_frame != -1 && current_frame <= prev_frame )
+    if ( prev_frame != -1 && current_frame <= prev_frame )
-                    return;
+        return;
-            } else {
+      } else {
-                // Don't skip
+    // Don't skip
-                current_frame++;
+    current_frame++;
-            }
+      }
-            if ( prev_frame == -1 || current_frame > prev_frame ) {
+      if ( prev_frame == -1 || current_frame > prev_frame ) {
-                if ( current_frame > prev_frame + 1 ) {
+    if ( current_frame > prev_frame + 1 ) {
-                    mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
+        mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
-                }
+    }
-                moreVideo = videoUI->playVideo();
+    moreVideo = videoUI->playVideo();
-                prev_frame = current_frame;
+    prev_frame = current_frame;
-            }
+      }
-        } else {
+  } else {
-            moreVideo = FALSE;
+      moreVideo = FALSE;
-            killTimer( videoId );
+      killTimer( videoId );
-        }
+  }
    }
 }
@@ -226,36 +224,37 @@ void LoopControl::startAudio() {
    if ( moreAudio ) {
-        if ( !isMuted && mediaPlayerState->curDecoder() ) {
+  if ( !isMuted && mediaPlayerState->curDecoder() ) {
-            currentSample = audioSampleCounter + 1;
+      currentSample = audioSampleCounter + 1;
-            if ( currentSample != audioSampleCounter + 1 )
+      if ( currentSample != audioSampleCounter + 1 )
-                qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter);
+    qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter);
-            long samplesRead = 0;
+      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 sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000;
-            long sampleWaitTime = currentSample - sampleWeShouldBeAt;
+      long sampleWaitTime = currentSample - sampleWeShouldBeAt;
-            if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) {
+        if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) {
-                usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) );
+      usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) );
-            } else if ( sampleWaitTime <= -5000 ) {
+        }
-                qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
+      else if ( sampleWaitTime <= -5000 ) {
-                //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
+     qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
-                currentSample = sampleWeShouldBeAt;
+     //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
-            }
+     currentSample = sampleWeShouldBeAt;
+       }
-            audioDevice->write( audioBuffer, samplesRead * 2 * channels );
+      audioDevice->write( audioBuffer, samplesRead * 2 * channels );
-            audioSampleCounter = currentSample + samplesRead - 1;
+      audioSampleCounter = currentSample + samplesRead - 1;
-            moreAudio = audioSampleCounter <= total_audio_samples;
+      moreAudio = readOk && (audioSampleCounter <= total_audio_samples);
-        } else {
+  } else {
-            moreAudio = FALSE;
+      moreAudio = FALSE;
-        }
+  }
    }
@@ -268,7 +267,7 @@ void LoopControl::killTimers() {
    audioMutex->lock();
    if ( hasVideoChannel ) 
-        killTimer( videoId );
+  killTimer( videoId );
    killTimer( sliderId );
    threadOkToGo = FALSE;
@@ -284,14 +283,14 @@ void LoopControl::startTimers() {
    moreAudio = FALSE;
    if ( hasVideoChannel ) {
-        moreVideo = TRUE;
+  moreVideo = TRUE;
-        int mSecsBetweenFrames = (int)(100 / framerate); // 10% of the real value
+  int mSecsBetweenFrames = (int)(100 / framerate); // 10% of the real value
-        videoId = startTimer( mSecsBetweenFrames );
+  videoId = startTimer( mSecsBetweenFrames );
    }
    if ( hasAudioChannel ) {
-        moreAudio = TRUE;
+  moreAudio = TRUE;
-        threadOkToGo = TRUE;
+  threadOkToGo = TRUE;
    }
    sliderId = startTimer( 300 ); // update slider every 1/3 second
@@ -303,16 +302,16 @@ void LoopControl::startTimers() {
 void LoopControl::setPaused( bool pause ) {
    if ( !mediaPlayerState->curDecoder() || !mediaPlayerState->curDecoder()->isOpen() )
-        return;
+  return;
    if ( pause ) {
-        killTimers();
+  killTimers();
    } else {
-        // Force an update of the position
+  // Force an update of the position
-        mediaPlayerState->setPosition( mediaPlayerState->position() + 1 );
+  mediaPlayerState->setPosition( mediaPlayerState->position() + 1 );
-        mediaPlayerState->setPosition( mediaPlayerState->position() - 1 );
+  mediaPlayerState->setPosition( mediaPlayerState->position() - 1 );
-        // Just like we never stopped
+  // Just like we never stopped
-        startTimers();
+  startTimers();
    }
 }
@@ -321,28 +320,28 @@ void LoopControl::stop( bool willPlayAgainShortly ) {
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
    if ( !willPlayAgainShortly && disabledSuspendScreenSaver ) {
-        disabledSuspendScreenSaver = FALSE; 
+  disabledSuspendScreenSaver = FALSE; 
-        // Re-enable the suspend mode
+  // Re-enable the suspend mode
-        QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
+  QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
    }
 #endif
    if ( mediaPlayerState->curDecoder() && mediaPlayerState->curDecoder()->isOpen() ) {
-        killTimers();
+  killTimers();
-        audioMutex->lock();
+  audioMutex->lock();
-        mediaPlayerState->curDecoder()->close();
+  mediaPlayerState->curDecoder()->close();
-        if ( audioDevice ) {
+  if ( audioDevice ) {
-            delete audioDevice;
+      delete audioDevice;
-            delete audioBuffer;
+      delete audioBuffer;
-            audioDevice = 0;
+      audioDevice = 0;
-            audioBuffer = 0;
+      audioBuffer = 0;
-        }
+  }
-        audioMutex->unlock();
+  audioMutex->unlock();
    }
 }
@@ -361,67 +360,67 @@ bool LoopControl::init( const QString& filename ) {
   
    // ### Hack to use libmpeg3plugin to get the number of audio samples if we are using the libmad plugin
    if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibMadPlugin") ) {
-        if ( mediaPlayerState->libMpeg3Decoder() && mediaPlayerState->libMpeg3Decoder()->open( filename ) ) {
+  if ( mediaPlayerState->libMpeg3Decoder() && mediaPlayerState->libMpeg3Decoder()->open( filename ) ) {
-            total_audio_samples = mediaPlayerState->libMpeg3Decoder()->audioSamples( 0 );
+      total_audio_samples = mediaPlayerState->libMpeg3Decoder()->audioSamples( 0 );
-            mediaPlayerState->libMpeg3Decoder()->close();
+      mediaPlayerState->libMpeg3Decoder()->close();
-        }
+  }
    }
+    
    if ( !mediaPlayerState->curDecoder()|| !mediaPlayerState->curDecoder()->open( filename ) ) {
-        audioMutex->unlock();
+  audioMutex->unlock();
-        return FALSE;
+  return FALSE;
    }
    hasAudioChannel = mediaPlayerState->curDecoder()->audioStreams() > 0;
    hasVideoChannel = mediaPlayerState->curDecoder()->videoStreams() > 0;
    if ( hasAudioChannel ) {
-        int astream = 0;
+  int astream = 0;
-        channels = mediaPlayerState->curDecoder()->audioChannels( astream );
+  channels = mediaPlayerState->curDecoder()->audioChannels( astream );
-        DecodeLoopDebug(( "channels = %d\n", channels ));
+  qDebug( "LC- channels = %d", channels );
-        
+  
-        if ( !total_audio_samples )
+  if ( !total_audio_samples )
-            total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream );
+      total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream );
-        total_audio_samples += 1000;
+//  total_audio_samples += 1000;
-        mediaPlayerState->setLength( total_audio_samples );
+  mediaPlayerState->setLength( total_audio_samples );
-        
+  
-        freq = mediaPlayerState->curDecoder()->audioFrequency( astream );
+  freq = mediaPlayerState->curDecoder()->audioFrequency( astream );
-        DecodeLoopDebug(( "frequency = %d\n", freq ));
+  qDebug( "LC- frequency = %d", freq );
-        audioSampleCounter = 0;
+  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() ];
+  audioBuffer = new char[ audioDevice->bufferSize() ];
-        channels = audioDevice->channels();
+  channels = audioDevice->channels();
-        //### must check which frequency is actually used.
+  //### must check which frequency is actually used.
-        static const int size = 1;
+  static const int size = 1;
-        short int buf[size];
+  short int buf[size];
-        long samplesRead = 0;
+  long samplesRead = 0;
-        mediaPlayerState->curDecoder()->audioReadSamples( buf, channels, size, samplesRead, stream );
+  mediaPlayerState->curDecoder()->audioReadSamples( buf, channels, size, samplesRead, stream );
    }
    if ( hasVideoChannel ) {
-        total_video_frames = mediaPlayerState->curDecoder()->videoFrames( stream );
+  total_video_frames = mediaPlayerState->curDecoder()->videoFrames( stream );
-        mediaPlayerState->setLength( total_video_frames );
+  mediaPlayerState->setLength( total_video_frames );
-        framerate = mediaPlayerState->curDecoder()->videoFrameRate( stream );
+  framerate = mediaPlayerState->curDecoder()->videoFrameRate( stream );
-        DecodeLoopDebug(( "Frame rate %g total %ld", framerate, total_video_frames ));
+  DecodeLoopDebug(( "Frame rate %g total %ld", framerate, total_video_frames ));
-        if ( framerate <= 1.0 ) {
+  if ( framerate <= 1.0 ) {
-            DecodeLoopDebug(( "Crazy frame rate, resetting to sensible" ));
+      DecodeLoopDebug(( "Crazy frame rate, resetting to sensible" ));
-            framerate = 25;
+      framerate = 25;
-        }
+  }
-        if ( total_video_frames == 1 ) {
+  if ( total_video_frames == 1 ) {
-            DecodeLoopDebug(( "Cannot seek to frame" ));
+      DecodeLoopDebug(( "Cannot seek to frame" ));
-        }
+  }
    }
@@ -441,11 +440,11 @@ void LoopControl::play() {
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
    if ( !disabledSuspendScreenSaver || previousSuspendMode != hasVideoChannel ) {
-        disabledSuspendScreenSaver = TRUE; 
+  disabledSuspendScreenSaver = TRUE; 
-        previousSuspendMode = hasVideoChannel;
+  previousSuspendMode = hasVideoChannel;
        // Stop the screen from blanking and power saving state
-        QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) 
+  QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) 
-            << ( hasVideoChannel ? QPEApplication::Disable : QPEApplication::DisableSuspend );
+      << ( hasVideoChannel ? QPEApplication::Disable : QPEApplication::DisableSuspend );
    }
 #endif
@@ -456,14 +455,14 @@ void LoopControl::play() {
 void LoopControl::setMute( bool on ) {
    if ( on != isMuted ) {
-        isMuted = on;
+  isMuted = on;
-        if ( !on ) {
+  if ( !on ) {
-            // Force an update of the position
+      // Force an update of the position
-            mediaPlayerState->setPosition( mediaPlayerState->position() + 1 );
+      mediaPlayerState->setPosition( mediaPlayerState->position() + 1 );
-            mediaPlayerState->setPosition( mediaPlayerState->position() - 1 );
+      mediaPlayerState->setPosition( mediaPlayerState->position() - 1 );
-            // Resume playing audio
+      // Resume playing audio
-            moreAudio = TRUE;
+      moreAudio = TRUE;
-        }
+  }
    }
 }
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,7 +1,7 @@
 /**********************************************************************
-** 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
@@ -17,9 +17,13 @@
 ** 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,7 +1,7 @@
 /**********************************************************************
-** 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
@@ -17,17 +17,15 @@
 ** 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>
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,7 +1,7 @@
 /**********************************************************************
-** 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
@@ -20,8 +20,6 @@
 #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
@@ -20,7 +20,6 @@
 #ifndef MEDIA_PLAYER_PLUGIN_INTERFACE_H
 #define MEDIA_PLAYER_PLUGIN_INTERFACE_H
 #include <qpe/qcom.h>
 #ifndef QT_NO_COMPONENT
@@ -62,12 +61,7 @@ public:
    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;
@@ -97,6 +91,9 @@ public:
    virtual bool supportsStereo() = 0;
    virtual bool supportsScaling() = 0;
+    // File Properies
+    virtual long getPlayTime() { return -1; }
+    virtual int audioBitsPerSample( int stream ) = 0;
 };
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,7 +1,7 @@
 /**********************************************************************
-** 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
@@ -19,13 +19,14 @@
 **********************************************************************/
 #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"
@@ -34,8 +35,8 @@
 #endif
-        #define MediaPlayerDebug(x)qDebug x
+//#define MediaPlayerDebug(x) qDebug x
-//#define MediaPlayerDebug(x)
+#define MediaPlayerDebug(x)
 MediaPlayerState::MediaPlayerState( QObject *parent, const char *name )
@@ -95,10 +96,10 @@ MediaPlayerDecoder *MediaPlayerState::newDecoder( const QString& file ) {
    MediaPlayerDecoder *tmpDecoder = NULL;
    QValueList<MediaPlayerPlugin>::Iterator it;
    for ( it = pluginList.begin(); it != pluginList.end(); ++it ) {
-        if ( (*it).decoder->isFileSupported( file ) ) {
+  if ( (*it).decoder->isFileSupported( file ) ) {
-            tmpDecoder = (*it).decoder;
+      tmpDecoder = (*it).decoder;
-            break;
+      break;
-        }
+  }
    }
    return decoder = tmpDecoder; 
 }
@@ -114,15 +115,19 @@ MediaPlayerDecoder *MediaPlayerState::libMpeg3Decoder() {
    return libmpeg3decoder;
 }
+// ### hack to get true sample count
+// MediaPlayerDecoder *MediaPlayerState::libWavDecoder() {
+//     return libwavdecoder;
+// }
 void MediaPlayerState::loadPlugins() {
 #ifndef QT_NO_COMPONENT
    QValueList<MediaPlayerPlugin>::Iterator mit;
    for ( mit = pluginList.begin(); mit != pluginList.end(); ++mit ) {
-        (*mit).iface->release();
+  (*mit).iface->release();
-        (*mit).library->unload();
+  (*mit).library->unload();
-        delete (*mit).library;
+  delete (*mit).library;
    }
    pluginList.clear();
@@ -131,29 +136,29 @@ void MediaPlayerState::loadPlugins() {
    QStringList list = dir.entryList();
    QStringList::Iterator it;
    for ( it = list.begin(); it != list.end(); ++it ) {
-        MediaPlayerPluginInterface *iface = 0;
+  MediaPlayerPluginInterface *iface = 0;
-        QLibrary *lib = new QLibrary( path + "/" + *it );
+  QLibrary *lib = new QLibrary( path + "/" + *it );
-        MediaPlayerDebug(( "querying: %s", QString( path + "/" + *it ).latin1() ));
+  MediaPlayerDebug(( "querying: %s", QString( path + "/" + *it ).latin1() ));
-        if ( lib->queryInterface( IID_MediaPlayerPlugin, (QUnknownInterface**)&iface ) == QS_OK ) {
+  if ( lib->queryInterface( IID_MediaPlayerPlugin, (QUnknownInterface**)&iface ) == QS_OK ) {
-            MediaPlayerDebug(( "loading: %s", QString( path + "/" + *it ).latin1() ));
+      MediaPlayerDebug(( "loading: %s", QString( path + "/" + *it ).latin1() ));
-            MediaPlayerPlugin plugin;
+      MediaPlayerPlugin plugin;
-            plugin.library = lib;
+      plugin.library = lib;
-            plugin.iface = iface;
+      plugin.iface = iface;
-            plugin.decoder = plugin.iface->decoder();
+      plugin.decoder = plugin.iface->decoder();
-            plugin.encoder = plugin.iface->encoder();
+      plugin.encoder = plugin.iface->encoder();
-            pluginList.append( plugin );
+      pluginList.append( plugin );
-            // ### hack to get true sample count
+      // ### hack to get true sample count
-            if ( plugin.decoder->pluginName() == QString("LibMpeg3Plugin") )
+      if ( plugin.decoder->pluginName() == QString("LibMpeg3Plugin") )
-                libmpeg3decoder = plugin.decoder;
+    libmpeg3decoder = plugin.decoder;
-        } else {
+  } else {
-            delete lib;
+      delete lib;
-        }
+  }
    }
 #else
    pluginList.clear();
@@ -178,8 +183,8 @@ void MediaPlayerState::loadPlugins() {
 #endif
    if ( pluginList.count() ) 
-        MediaPlayerDebug(( "%i decoders found", pluginList.count() ));
+  MediaPlayerDebug(( "%i decoders found", pluginList.count() ));
    else
-        MediaPlayerDebug(( "No decoders found" ));
+  MediaPlayerDebug(( "No decoders found" ));
 }
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,21 +1,22 @@
-        TEMPLATE= app
+TEMPLATE  = app
-        CONFIG  = qt warn_on release
+CONFIG    = qt warn_on release
-        DESTDIR         = $(OPIEDIR)/bin
+#release
-        HEADERS         = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \
+DESTDIR   = $(OPIEDIR)/bin
-                  videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h
+HEADERS   = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \
-        SOURCES         = main.cpp \
+      videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h
-                  loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \
+SOURCES   = main.cpp \
-                  videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp audiodevice.cpp
+      loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \
-        TARGET  = mpegplayer
+      videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp audiodevice.cpp
-        INCLUDEPATH+= $(OPIEDIR)/include
+TARGET    = mpegplayer
-        DEPENDPATH+= $(OPIEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lpthread
-        # INTERFACES= 
+# INTERFACES  = 
 # INCLUDEPATH += $(OPIEDIR)/include
 # CONFIG+=static
 # TMAKE_CXXFLAGS += -DQPIM_STANDALONE
-        # LIBS  += libmpeg3/libmpeg3.a -lpthread
+# LIBS    += libmpeg3/libmpeg3.a -lpthread
-        # LIBS  += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so
+# LIBS    += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so
 TRANSLATIONS = ../i18n/de/mpegplayer.ts
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
@@ -33,8 +33,8 @@
 class PlayListSelectionItem : public QListViewItem {
 public:
    PlayListSelectionItem( QListView *parent, const DocLnk *f ) : QListViewItem( parent ), fl( f ) {
-        setText( 0, f->name() );
+  setText( 0, f->name() );
-        setPixmap( 0, f->pixmap() );
+  setPixmap( 0, f->pixmap() );
    }
    ~PlayListSelectionItem() {
@@ -50,10 +50,12 @@ 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" ) );
+//    setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) );
-#endif
+    setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) );
+// #endif
+    addColumn("Title",236);
    setAllColumnsShowFocus( TRUE );
    addColumn( tr( "Playlist Selection" ) );
    header()->hide();
@@ -65,24 +67,25 @@ 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 );
+  p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo );
 }
-#endif
+// #endif
 void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) {
    if ( event->state() == QMouseEvent::LeftButton ) {
-        QListViewItem *currentItem = selectedItem();
+  QListViewItem *currentItem = selectedItem();
-        QListViewItem *itemUnder = itemAt( QPoint( event->pos().x(), event->pos().y() - contentsY() ) );
+  QListViewItem *itemUnder = itemAt( QPoint( event->pos().x(), event->pos().y() - contentsY() ) );
-        if ( currentItem && currentItem->itemAbove() == itemUnder )
+  if ( currentItem && currentItem->itemAbove() == itemUnder )
-            moveSelectedUp();
+      moveSelectedUp();
-        else if ( currentItem && currentItem->itemBelow() == itemUnder )
+  else if ( currentItem && currentItem->itemBelow() == itemUnder )
-            moveSelectedDown();
+      moveSelectedDown();
    }
 }
@@ -90,7 +93,7 @@ void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) {
 const DocLnk *PlayListSelection::current() {
    PlayListSelectionItem *item = (PlayListSelectionItem *)selectedItem();
    if ( item )
-        return item->file();
+  return item->file();
    return NULL;
 }
@@ -108,7 +111,7 @@ void PlayListSelection::addToSelection( const DocLnk &lnk ) {
 void PlayListSelection::removeSelected() {
    QListViewItem *item = selectedItem();
    if ( item )
-        delete item;
+  delete item;
    setSelected( currentItem(), TRUE );
    ensureItemVisible( selectedItem() );
 }
@@ -117,7 +120,7 @@ void PlayListSelection::removeSelected() {
 void PlayListSelection::moveSelectedUp() {
    QListViewItem *item = selectedItem();
    if ( item && item->itemAbove() )
-        item->itemAbove()->moveItem( item );
+  item->itemAbove()->moveItem( item );
    ensureItemVisible( selectedItem() );
 }
@@ -135,7 +138,7 @@ bool PlayListSelection::prev() {
    if ( item && item->itemAbove() )
        setSelected( item->itemAbove(), TRUE );
    else
-        return FALSE;
+  return FALSE;
    ensureItemVisible( selectedItem() );
    return TRUE;
 }
@@ -146,7 +149,7 @@ bool PlayListSelection::next() {
    if ( item && item->itemBelow() )
        setSelected( item->itemBelow(), TRUE );
    else
-        return FALSE;
+  return FALSE;
    ensureItemVisible( selectedItem() );
    return TRUE;
 }
@@ -157,7 +160,7 @@ bool PlayListSelection::first() {
    if ( item )
        setSelected( item, TRUE );
    else
-        return FALSE;
+  return FALSE;
    ensureItemVisible( selectedItem() );
    return TRUE;
 }
@@ -167,11 +170,11 @@ bool PlayListSelection::last() {
    QListViewItem *prevItem = NULL;
    QListViewItem *item = firstChild();
    while ( ( item = item->nextSibling() ) )
-        prevItem = item;
+  prevItem = item;
    if ( prevItem )
        setSelected( prevItem, TRUE );
    else
-        return FALSE;
+  return FALSE;
    ensureItemVisible( selectedItem() );
    return TRUE;
 }
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
@@ -20,8 +20,6 @@
 #ifndef PLAY_LIST_SELECTION_H
 #define PLAY_LIST_SELECTION_H
 #include <qlist.h>
 #include <qlistview.h>
 #include <qpe/applnk.h>
@@ -47,10 +45,10 @@ public slots:
 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;
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,7 +1,7 @@
 /**********************************************************************
-** 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
@@ -21,6 +21,8 @@
 #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>
@@ -35,6 +37,10 @@
 #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"
@@ -42,18 +48,18 @@
 #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 *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList,  *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove;
-    QToolButton *tbFull;
-    QToolButton *tbLoop;
-    QToolButton *tbScale;
-    QToolButton *tbShuffle;
    QFrame *playListFrame;
    FileSelector *files;
    PlayListSelection *selectedFiles;
@@ -65,14 +71,14 @@ public:
 class ToolButton : public QToolButton {
 public:
    ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
-        : QToolButton( parent, name ) {
+  : QToolButton( parent, name ) {
-        setTextLabel( name );
+  setTextLabel( name );
-        setPixmap( Resource::loadPixmap( icon ) );
+  setPixmap( Resource::loadPixmap( icon ) );
-        setAutoRaise( TRUE );
+  setAutoRaise( TRUE );
-        setFocusPolicy( QWidget::NoFocus );
+  setFocusPolicy( QWidget::NoFocus );
-        setToggleButton( t );
+  setToggleButton( t );
-        connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
+  connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
-        QPEMenuToolFocusManager::manager()->addWidget( this );
+  QPEMenuToolFocusManager::manager()->addWidget( this );
    }
 };
@@ -80,9 +86,9 @@ public:
 class MenuItem : public QAction {
 public:
    MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot )
-        : QAction( text, QString::null, 0, 0 ) {
+  : QAction( text, QString::null, 0, 0 ) {
-        connect( this, SIGNAL( activated() ), handler, slot );
+  connect( this, SIGNAL( activated() ), handler, slot );
-        addTo( parent );
+  addTo( parent );
    }
 };
@@ -93,10 +99,12 @@ 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 );
@@ -111,79 +119,146 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
    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->tbPlay    = new ToolButton( bar, tr( "Play" ),       "mpegplayer/play",    mediaPlayerState, SLOT(setPlaying(bool)), TRUE );
+    d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "mpegplayer/remove_from_playlist", this , SLOT(removeSelected()) );
-    d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),  "mpegplayer/shuffle", mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
+    d->tbPlay    = new ToolButton( bar, tr( "Play" ),"mpegplayer/play", mediaPlayerState, SLOT( setPlaying(bool)), TRUE );
-#endif
+    d->tbShuffle = new ToolButton( bar, tr( "Randomize" ), "mpegplayer/shuffle", mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
-    d->tbLoop    = new ToolButton( bar, tr( "Loop" ),       "mpegplayer/loop",    mediaPlayerState, SLOT(setLooping(bool)), TRUE );
+    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 );
+    menu->insertItem( tr( "File" ), pmPlayList );
-            new MenuItem( pmPlayList, tr( "Toggle PlayList" ),   mediaPlayerState, SLOT( togglePlaylist() ) );
    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 );    
+    QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton );
-    plString->setBackgroundMode( QButton::PaletteButton );
+    d->playListFrame = vbox3;
-    plString->setFont( QFont( "Helvetica", 8, QFont::Bold ) );
+    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->selectedFiles = new PlayListSelection( hbox2);
-    d->tbPlay = new ToolButton( vbox1, tr( "Play" ), "mpegplayer/play", mediaPlayerState, SLOT(setPlaying(bool)), TRUE );
+    QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton );
-    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
+     QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
+     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
+    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 );    
+//      connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
-    libString->setBackgroundMode( QButton::PaletteButton );
+//      connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
-    libString->setFont( QFont( "Helvetica", 8, QFont::Bold ) );
-    QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton );
+   connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
-    d->files = new FileSelector( "video/*;audio/*", hbox6, "Find Media Files", FALSE, FALSE );
+   connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
-    d->files->setBackgroundMode( PaletteButton );
-    QVBox *vbox7 = new QVBox( hbox6 ); vbox7->setBackgroundMode( PaletteButton );
+   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 ) ), fullScreenButton,    SLOT( setOn( bool ) ) );
-    connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), d->tbScale,   SLOT( setEnabled( 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" );
@@ -198,19 +273,20 @@ PlayListWidget::~PlayListWidget() {
    writeConfig( cfg );
    if ( d->current )
-        delete d->current;
+  delete d->current;
    delete d;
 }
 void PlayListWidget::initializeStates() {
    d->tbPlay->setOn( mediaPlayerState->playing() );
    d->tbLoop->setOn( mediaPlayerState->looping() );
    d->tbShuffle->setOn( mediaPlayerState->shuffled() );
-    d->tbFull->setOn( mediaPlayerState->fullscreen() );
+//     d->tbFull->setOn( mediaPlayerState->fullscreen() );
-    d->tbScale->setOn( mediaPlayerState->scaled() );
+//     d->tbScale->setOn( mediaPlayerState->scaled() );
-    d->tbScale->setEnabled( mediaPlayerState->fullscreen() );
+//     d->tbScale->setEnabled( mediaPlayerState->fullscreen() );
-    setPlaylist( mediaPlayerState->playlist() );
+//    setPlaylist( mediaPlayerState->playlist() );
 }
@@ -220,11 +296,11 @@ void PlayListWidget::readConfig( Config& cfg ) {
    int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
    
    for ( int i = 0; i < noOfFiles; i++ ) {
-        QString entryName;
+  QString entryName;
-        entryName.sprintf( "File%i", i + 1 );
+  entryName.sprintf( "File%i", i + 1 );
-        QString linkFile = cfg.readEntry( entryName );
+  QString linkFile = cfg.readEntry( entryName );
-        DocLnk lnk( linkFile );
+  DocLnk lnk( linkFile );
-        if ( lnk.isValid() )
+  if ( lnk.isValid() )
            d->selectedFiles->addToSelection( lnk );
    }
@@ -238,28 +314,28 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
    d->selectedFiles->first();
    do {
-        const DocLnk *lnk = d->selectedFiles->current();
+  const DocLnk *lnk = d->selectedFiles->current();
-        if ( lnk ) {
+  if ( lnk ) {
-            QString entryName;
+      QString entryName;
-            entryName.sprintf( "File%i", noOfFiles + 1 );
+      entryName.sprintf( "File%i", noOfFiles + 1 );
-            cfg.writeEntry( entryName, lnk->linkFile() );
+      cfg.writeEntry( entryName, lnk->linkFile() );
-            // if this link does exist, add it so we have the file
+      // if this link does exist, add it so we have the file
-            // next time...
+      // next time...
-            if ( !QFile::exists( lnk->linkFile() ) ) {
+      if ( !QFile::exists( lnk->linkFile() ) ) {
-                // the way writing lnks doesn't really check for out
+    // the way writing lnks doesn't really check for out
-                // of disk space, but check it anyway.
+    // of disk space, but check it anyway.
-                if ( !lnk->writeLink() ) {
+    if ( !lnk->writeLink() ) {
-                    QMessageBox::critical( 0, tr("Out of space"),
+        QMessageBox::critical( 0, tr("Out of space"),
-                                           tr( "There was a problem saving "
+             tr( "There was a problem saving "
-                                               "the playlist.\n"
+                 "the playlist.\n"
-                                               "Your playlist "
+                 "Your playlist "
-                                               "may be missing some entries\n"
+                 "may be missing some entries\n"
-                                               "the next time you start it." )
+                 "the next time you start it." )
-                                           );
+             );
-                }
+    }
-                    }      
+      }      
-            noOfFiles++;
+      noOfFiles++;
-        }
+  }
    } while ( d->selectedFiles->next() );
    
    cfg.writeEntry("NumberOfFiles", noOfFiles );
@@ -267,17 +343,27 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
 void PlayListWidget::addToSelection( const DocLnk& lnk ) {
-    d->setDocumentUsed = FALSE;
+ d->setDocumentUsed = FALSE;
    if ( mediaPlayerState->playlist() )
        d->selectedFiles->addToSelection( lnk );
    else
-        mediaPlayerState->setPlaying( TRUE );
+  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();
+  d->selectedFiles->removeSelected();
 }
@@ -310,16 +396,16 @@ void PlayListWidget::addAllVideoToList() {
 void PlayListWidget::setDocument(const QString& fileref) {
    if ( fileref.isNull() ) {
-        QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) );
+  QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) );
-        return;
+  return;
    }
    if ( mediaPlayerState->playlist() )
-        addToSelection( DocLnk( fileref ) );
+  addToSelection( DocLnk( fileref ) );
    else {
-        d->setDocumentUsed = TRUE;
+  d->setDocumentUsed = TRUE;
-        if ( d->current )
+  if ( d->current )
-            delete d->current;
+      delete d->current;
-        d->current = new DocLnk( fileref );
+  d->current = new DocLnk( fileref );
    }
    mediaPlayerState->setPlaying( FALSE );
    mediaPlayerState->setPlaying( TRUE );
@@ -341,76 +427,76 @@ void PlayListWidget::useSelectedDocument() {
 const DocLnk *PlayListWidget::current() {
    if ( mediaPlayerState->playlist() )
-        return d->selectedFiles->current();
+  return d->selectedFiles->current();
    else if ( d->setDocumentUsed && d->current ) {
-        return d->current;
+  return d->current;
    } else
-        return d->files->selected();
+  return d->files->selected();
 }
 bool PlayListWidget::prev() {
    if ( mediaPlayerState->playlist() ) {
-        if ( mediaPlayerState->shuffled() ) {
+  if ( mediaPlayerState->shuffled() ) {
-            const DocLnk *cur = current();
+      const DocLnk *cur = current();
-            int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
+      int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
-            for ( int i = 0; i < j; i++ ) {
+      for ( int i = 0; i < j; i++ ) {
-                if ( !d->selectedFiles->next() )
+    if ( !d->selectedFiles->next() )
-                    d->selectedFiles->first();
+        d->selectedFiles->first();
-            }
+      }
-            if ( cur == current() )
+      if ( cur == current() )
-                if ( !d->selectedFiles->next() )
+    if ( !d->selectedFiles->next() )
-                    d->selectedFiles->first();
+        d->selectedFiles->first();
-            return TRUE;
+      return TRUE;
-        } else {
+  } else {
-            if ( !d->selectedFiles->prev() ) {
+      if ( !d->selectedFiles->prev() ) {
-                if ( mediaPlayerState->looping() ) {
+    if ( mediaPlayerState->looping() ) {
-                    return d->selectedFiles->last();
+        return d->selectedFiles->last();
-                } else {
+    } else {
-                    return FALSE;
+        return FALSE;
-                }
+    }
-            }
+      }
-            return TRUE;
+      return TRUE;
-        }
+  }
    } else {
-        return mediaPlayerState->looping();
+  return mediaPlayerState->looping();
    }
 }
 bool PlayListWidget::next() {
    if ( mediaPlayerState->playlist() ) {
-        if ( mediaPlayerState->shuffled() ) {
+  if ( mediaPlayerState->shuffled() ) {
-            return prev();
+      return prev();
-        } else {
+  } else {
-            if ( !d->selectedFiles->next() ) {
+      if ( !d->selectedFiles->next() ) {
-                if ( mediaPlayerState->looping() ) {
+    if ( mediaPlayerState->looping() ) {
-                    return d->selectedFiles->first();
+        return d->selectedFiles->first();
-                } else {
+    } else {
-                    return FALSE;
+        return FALSE;
-                }
+    }
-            }
+      }
-            return TRUE;
+      return TRUE;
-        }
+  }
    } else {
-        return mediaPlayerState->looping();
+  return mediaPlayerState->looping();
    }
 }
 bool PlayListWidget::first() {
    if ( mediaPlayerState->playlist() )
-        return d->selectedFiles->first();
+  return d->selectedFiles->first();
    else
-        return mediaPlayerState->looping();
+  return mediaPlayerState->looping();
 }
 bool PlayListWidget::last() {
    if ( mediaPlayerState->playlist() )
-        return d->selectedFiles->last();
+  return d->selectedFiles->last();
    else
-        return mediaPlayerState->looping();
+  return mediaPlayerState->looping();
 }
@@ -434,16 +520,130 @@ void PlayListWidget::loadList() {
 void PlayListWidget::setPlaylist( bool shown ) {
    if ( shown ) 
-        d->playListFrame->show();
+  d->playListFrame->show();
    else
-        d->playListFrame->hide();
+  d->playListFrame->hide();
 }
 void PlayListWidget::setView( char view ) {
    if ( view == 'l' )
-        showMaximized();
+  showMaximized();
    else
-        hide();
+  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,7 +1,7 @@
 /**********************************************************************
-** 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
@@ -22,25 +22,39 @@
 #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 );
@@ -50,16 +64,31 @@ public slots:
    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(); */
 };
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,7 +1,7 @@
 /**********************************************************************
-** 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
@@ -17,9 +17,8 @@
 ** not clear to you.
 **
 **********************************************************************/
 #include <qpe/resource.h>
-#include <qpe/mediaplayerplugininterface.h>
+#include "mediaplayerplugininterface.h"
 #include <qwidget.h>
 #include <qpainter.h>
 #include <qpixmap.h>
@@ -67,7 +66,7 @@ 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" ) );
@@ -81,8 +80,8 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
    slider->setFocusPolicy( QWidget::NoFocus );
    slider->setGeometry( QRect( 7, 250, 220, 20 ) );
-            connect( slider,       SIGNAL( sliderPressed() ),      this, SLOT( sliderPressed() ) );
+    connect( slider,         SIGNAL( sliderPressed() ),      this, SLOT( sliderPressed() ) );
-            connect( slider,       SIGNAL( sliderReleased() ),     this, SLOT( sliderReleased() ) );
+    connect( slider,         SIGNAL( sliderReleased() ),     this, SLOT( sliderReleased() ) );
    connect( mediaPlayerState, SIGNAL( lengthChanged(long) ),  this, SLOT( setLength(long) ) );
    connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
@@ -102,7 +101,7 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
 VideoWidget::~VideoWidget() {
    for ( int i = 0; i < 3; i++ )
-        delete pixmaps[i];
+  delete pixmaps[i];
    delete currentFrame;
 }
@@ -118,7 +117,7 @@ void VideoWidget::sliderPressed() {
 void VideoWidget::sliderReleased() {
    videoSliderBeingMoved = FALSE;
    if ( slider->width() == 0 )
-        return;
+  return;
    long val = long((double)slider->value() * mediaPlayerState->length() / slider->width());
    mediaPlayerState->setPosition( val );
 }
@@ -136,12 +135,12 @@ void VideoWidget::setLength( long max ) {
 void VideoWidget::setView( char view ) {
    if ( view == 'v' ) {
-        makeVisible();
+  makeVisible();
    } else {
-        // Effectively blank the view next time we show it so it looks nicer
+  // Effectively blank the view next time we show it so it looks nicer
-        scaledWidth = 0;
+  scaledWidth = 0;
-        scaledHeight = 0;
+  scaledHeight = 0;
-        hide();
+  hide();
    }
 }
@@ -149,21 +148,21 @@ void VideoWidget::setView( char view ) {
 void VideoWidget::updateSlider( long i, long max ) {
    // Will flicker too much if we don't do this
    if ( max == 0 )
-        return;
+  return;
    int width = slider->width();
    int val = int((double)i * width / max);
    if ( !mediaPlayerState->fullscreen() && !videoSliderBeingMoved ) {
-        if ( slider->value() != val )
+  if ( slider->value() != val )
-            slider->setValue( val );
+      slider->setValue( val );
-        if ( slider->maxValue() != width )
+  if ( slider->maxValue() != width )
-            slider->setMaxValue( width );
+      slider->setMaxValue( width );
    }
 }
 void VideoWidget::setToggleButton( int i, bool down ) {
    if ( down != videoButtons[i].isDown )
-        toggleButton( i );
+  toggleButton( i );
 }
@@ -185,36 +184,36 @@ void VideoWidget::paintButton( QPainter *p, int i ) {
 void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
    for ( int i = 0; i < numButtons; i++ ) {
-        int x = videoButtons[i].xPos;
+  int x = videoButtons[i].xPos;
-        int y = videoButtons[i].yPos;
+  int y = videoButtons[i].yPos;
-        if ( event->state() == QMouseEvent::LeftButton ) {
+  if ( event->state() == QMouseEvent::LeftButton ) {
-            // The test to see if the mouse click is inside the circular button or not
+      // The test to see if the mouse click is inside the circular button or not
-            // (compared with the radius squared to avoid a square-root of our distance)
+      // (compared with the radius squared to avoid a square-root of our distance)
-            int radius = 16;
+      int radius = 16;
-            QPoint center = QPoint( x + radius, y + radius );
+      QPoint center = QPoint( x + radius, y + radius );
-            QPoint dXY = center - event->pos();
+      QPoint dXY = center - event->pos();
-            int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y();
+      int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y();
-            bool isOnButton = dist <= (radius * radius);
+      bool isOnButton = dist <= (radius * radius);
-            if ( isOnButton != videoButtons[i].isHeld ) {
+      if ( isOnButton != videoButtons[i].isHeld ) {
-                videoButtons[i].isHeld = isOnButton;
+    videoButtons[i].isHeld = isOnButton;
-                toggleButton(i);
+    toggleButton(i);
-            }
+      }
-        } else {
+  } else {
-            if ( videoButtons[i].isHeld ) {
+      if ( videoButtons[i].isHeld ) {
-                videoButtons[i].isHeld = FALSE;
+    videoButtons[i].isHeld = FALSE;
-                if ( !videoButtons[i].isToggle ) 
+    if ( !videoButtons[i].isToggle ) 
-                    setToggleButton( i, FALSE );
+        setToggleButton( i, FALSE );
-                switch (i) {
+    switch (i) {
-                    case VideoPlay:       mediaPlayerState->setPlaying(videoButtons[i].isDown); return;
+        case VideoPlay:       mediaPlayerState->setPlaying(videoButtons[i].isDown); return;
-                    case VideoStop:       mediaPlayerState->setPlaying(FALSE); return;
+        case VideoStop:       mediaPlayerState->setPlaying(FALSE); return;
-                    case VideoPause:      mediaPlayerState->setPaused(videoButtons[i].isDown); return;
+        case VideoPause:      mediaPlayerState->setPaused(videoButtons[i].isDown); return;
-                    case VideoNext:       mediaPlayerState->setNext(); return;
+        case VideoNext:       mediaPlayerState->setNext(); return;
-                    case VideoPrevious:   mediaPlayerState->setPrev(); return;
+        case VideoPrevious:   mediaPlayerState->setPrev(); return;
-                    case VideoPlayList:   mediaPlayerState->setList(); return;
+        case VideoPlayList:   mediaPlayerState->setList(); return;
-                    case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
+        case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
-                }
+    }
-            }
+      }
-        }
+  }
    }
 }
@@ -226,25 +225,25 @@ void VideoWidget::mousePressEvent( QMouseEvent *event ) {
 void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
    if ( mediaPlayerState->fullscreen() ) {
-        mediaPlayerState->setFullscreen( FALSE );
+  mediaPlayerState->setFullscreen( FALSE );
-        makeVisible();
+  makeVisible();
    } else { 
-        mouseMoveEvent( event );
+  mouseMoveEvent( event );
    }
 }
 void VideoWidget::makeVisible() {
    if ( mediaPlayerState->fullscreen() ) {
-        setBackgroundMode( QWidget::NoBackground );
+  setBackgroundMode( QWidget::NoBackground );
-        showFullScreen();
+  showFullScreen();
-        resize( qApp->desktop()->size() );
+  resize( qApp->desktop()->size() );
-        slider->hide();
+  slider->hide();
    } else {
-        setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
+  setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
-        showNormal();
+  showNormal();
-        showMaximized();
+  showMaximized();
-        slider->show();
+  slider->show();
    }
 }
@@ -253,29 +252,29 @@ void VideoWidget::paintEvent( QPaintEvent * ) {
    QPainter p( this );
    if ( mediaPlayerState->fullscreen() ) {
-        // Clear the background 
+  // Clear the background 
-        p.setBrush( QBrush( Qt::black ) );
+  p.setBrush( QBrush( Qt::black ) );
-        p.drawRect( rect() );
+  p.drawRect( rect() );
-        // Draw the current frame
+  // Draw the current frame
-        //p.drawImage( ); // If using directpainter we won't have a copy except whats on the screen
+  //p.drawImage( ); // If using directpainter we won't have a copy except whats on the screen
    } else {
-        // draw border
+  // draw border
-        qDrawShadePanel( &p, 4, 15, 230, 170, colorGroup(), TRUE, 5, NULL );
+  qDrawShadePanel( &p, 4, 15, 230, 170, colorGroup(), TRUE, 5, NULL );
-        // Clear the movie screen first
+  // Clear the movie screen first
-        p.setBrush( QBrush( Qt::black ) );
+  p.setBrush( QBrush( Qt::black ) );
-        p.drawRect( 9, 20, 220, 160 );
+  p.drawRect( 9, 20, 220, 160 );
-        // draw current frame (centrally positioned from scaling to maintain aspect ratio)
+  // draw current frame (centrally positioned from scaling to maintain aspect ratio)
-        p.drawImage( 9 + (220 - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight );
+  p.drawImage( 9 + (220 - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight );
-        // draw the buttons
+  // draw the buttons
-        for ( int i = 0; i < numButtons; i++ )
+  for ( int i = 0; i < numButtons; i++ )
-            paintButton( &p, i );
+      paintButton( &p, i );
-        // draw the slider
+  // draw the slider
-        slider->repaint( TRUE );
+  slider->repaint( TRUE );
    }
 }
@@ -300,121 +299,121 @@ bool VideoWidget::playVideo() {
    if ( mediaPlayerState->fullscreen() ) {
 #ifdef USE_DIRECT_PAINTER
-        QDirectPainter p(this);
+  QDirectPainter p(this);
-        if ( ( qt_screen->transformOrientation() == 3 ) &&
+  if ( ( qt_screen->transformOrientation() == 3 ) &&
-             ( ( dd == 16 ) || ( dd == 32 ) ) && ( p.numRects() == 1 ) ) {
+       ( ( dd == 16 ) || ( dd == 32 ) ) && ( p.numRects() == 1 ) ) {
-            w = 320;
+      w = 320;
-            h = 240;
+      h = 240;
-            if ( mediaPlayerState->scaled() ) {
+      if ( mediaPlayerState->scaled() ) {
-                // maintain aspect ratio
+    // maintain aspect ratio
-                if ( w * sh > sw * h ) 
+    if ( w * sh > sw * h ) 
-                    w = sw * h / sh;
+        w = sw * h / sh;
-                else
+    else
-                    h = sh * w / sw;
+        h = sh * w / sw;
-            } else  {
+      } else  {
-                w = sw;
+    w = sw;
-                        h = sh;    
+    h = sh;     
-            }
+      }
-            w--; // we can't allow libmpeg to overwrite.
+      w--; // we can't allow libmpeg to overwrite.
-            QPoint roff = qt_screen->mapToDevice( p.offset(), QSize( qt_screen->width(), qt_screen->height() ) );
+      QPoint roff = qt_screen->mapToDevice( p.offset(), QSize( qt_screen->width(), qt_screen->height() ) );
-            
+      
-            int ox = roff.x() - height() + 2 + (height() - w) / 2;
+      int ox = roff.x() - height() + 2 + (height() - w) / 2;
-            int oy = roff.y() + (width() - h) / 2;
+      int oy = roff.y() + (width() - h) / 2;
-            int sx = 0, sy = 0;
+      int sx = 0, sy = 0;
-            uchar* fp = p.frameBuffer() + p.lineStep() * oy;
+      uchar* fp = p.frameBuffer() + p.lineStep() * oy;
-            fp += dd * ox / 8;
+      fp += dd * ox / 8;
-            uchar **jt = new uchar*[h];
+      uchar **jt = new uchar*[h];
-            for ( int i = h; i; i-- ) {
+      for ( int i = h; i; i-- ) {
-                jt[h - i] = fp;
+    jt[h - i] = fp;
-                fp += p.lineStep();
+    fp += p.lineStep();
-            }
+      }
-            result = mediaPlayerState->curDecoder()->videoReadScaledFrame( jt, sx, sy, sw, sh, w, h, format, 0) == 0;
+      result = mediaPlayerState->curDecoder()->videoReadScaledFrame( jt, sx, sy, sw, sh, w, h, format, 0) == 0;
-            delete [] jt;
+      delete [] jt;
-        } else {
+  } else {
 #endif
-            QPainter p(this);
+      QPainter p(this);
-            w = 320;
+      w = 320;
-            h = 240;
+      h = 240;
-            if ( mediaPlayerState->scaled() ) {
+      if ( mediaPlayerState->scaled() ) {
-                // maintain aspect ratio
+    // maintain aspect ratio
-                if ( w * sh > sw * h ) 
+    if ( w * sh > sw * h ) 
-                    w = sw * h / sh;
+        w = sw * h / sh;
-                else
+    else
-                    h = sh * w / sw;
+        h = sh * w / sw;
-            } else  {
+      } else  {
-                w = sw;
+    w = sw;
-                        h = sh;    
+    h = sh;     
-            }
+      }
-            int bytes = ( dd == 16 ) ? 2 : 4;
+      int bytes = ( dd == 16 ) ? 2 : 4;
-            QImage tempFrame( w, h, bytes << 3 );
+      QImage tempFrame( w, h, bytes << 3 );
-            result = mediaPlayerState->curDecoder()->videoReadScaledFrame( tempFrame.jumpTable(),
+      result = mediaPlayerState->curDecoder()->videoReadScaledFrame( tempFrame.jumpTable(),
-                                                        0, 0, sw, sh, w, h, format, 0) == 0;
+              0, 0, sw, sh, w, h, format, 0) == 0;
-            if ( result && mediaPlayerState->fullscreen() ) {
+      if ( result && mediaPlayerState->fullscreen() ) {
-                int rw = h, rh = w;
+    int rw = h, rh = w;
-                QImage rotatedFrame( rw, rh, bytes << 3 );
+    QImage rotatedFrame( rw, rh, bytes << 3 );
-                ushort* in  = (ushort*)tempFrame.bits();
+    ushort* in  = (ushort*)tempFrame.bits();
-                ushort* out = (ushort*)rotatedFrame.bits();
+    ushort* out = (ushort*)rotatedFrame.bits();
-                int spl = rotatedFrame.bytesPerLine() / bytes;
+    int spl = rotatedFrame.bytesPerLine() / bytes;
-                for (int x=0; x<h; x++) {
+    for (int x=0; x<h; x++) {
-                    if ( bytes == 2 ) {
+        if ( bytes == 2 ) {
-                        ushort* lout = out++ + (w - 1)*spl;
+      ushort* lout = out++ + (w - 1)*spl;
-                        for (int y=0; y<w; y++) {
+      for (int y=0; y<w; y++) {
-                            *lout=*in++;
+          *lout=*in++;
-                            lout-=spl;
+          lout-=spl;
-                        }
+      }
-                    } else {
+        } else {
-                        ulong* lout = ((ulong *)out)++ + (w - 1)*spl;
+      ulong* lout = ((ulong *)out)++ + (w - 1)*spl;
-                        for (int y=0; y<w; y++) {
+      for (int y=0; y<w; y++) {
-                            *lout=*((ulong*)in)++;
+          *lout=*((ulong*)in)++;
-                            lout-=spl;
+          lout-=spl;
-                        }
+      }
-                    }
+        }
-                }
+    }
-                p.drawImage( (240 - rw) / 2, (320 - rh) / 2, rotatedFrame, 0, 0, rw, rh );
+    p.drawImage( (240 - rw) / 2, (320 - rh) / 2, rotatedFrame, 0, 0, rw, rh );
-            }
+      }
 #ifdef USE_DIRECT_PAINTER
-        }
+  }
 #endif
    } else {
-        w = 220;
+  w = 220;
-        h = 160;
+  h = 160;
-        // maintain aspect ratio
+  // maintain aspect ratio
-        if ( w * sh > sw * h ) 
+  if ( w * sh > sw * h ) 
-            w = sw * h / sh;
+      w = sw * h / sh;
-        else
+  else
-            h = sh * w / sw;
+      h = sh * w / sw;
-        result = mediaPlayerState->curDecoder()->videoReadScaledFrame( currentFrame->jumpTable(), 0, 0, sw, sh, w, h, format, 0) == 0;
+  result = mediaPlayerState->curDecoder()->videoReadScaledFrame( currentFrame->jumpTable(), 0, 0, sw, sh, w, h, format, 0) == 0;
-        QPainter p( this );
+  QPainter p( this );
-        // Image changed size, therefore need to blank the possibly unpainted regions first
+  // Image changed size, therefore need to blank the possibly unpainted regions first
-        if ( scaledWidth != w || scaledHeight != h ) {
+  if ( scaledWidth != w || scaledHeight != h ) {
-            p.setBrush( QBrush( Qt::black ) );
+      p.setBrush( QBrush( Qt::black ) );
-            p.drawRect( 9, 20, 220, 160 );
+      p.drawRect( 9, 20, 220, 160 );
-        }
+  }
-        scaledWidth = w;
+  scaledWidth = w;
-        scaledHeight = h;
+  scaledHeight = h;
-        if ( result ) {
+  if ( result ) {
-            p.drawImage( 9 + (220 - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight );
+      p.drawImage( 9 + (220 - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight );
-        }
+  }
    }
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
@@ -100,10 +100,12 @@ REQUIRES=
 ####### Compile
 wavplugin.o: wavplugin.cpp \
-                wavplugin.h
+                wavplugin.h \
+                ../mediaplayerplugininterface.h
 wavpluginimpl.o: wavpluginimpl.cpp \
                wavplugin.h \
+                ../mediaplayerplugininterface.h \
                wavpluginimpl.h