reverted back till I figure out

8 files changed, 158 insertions, 80 deletions

diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index 3901446..cda3f77 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -211,38 +211,40 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
               // 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)
             int radius = 32 + 13 * size;
             QPoint center = QPoint( x + radius, y + radius );
             QPoint dXY = center - event->pos();
             int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y();
             bool isOnButton = dist <= (radius * radius);
 //      QRect r( x, y, 64 + 22*size, 64 + 22*size );
 //      bool isOnButton = r.contains( event->pos() ); // Rectangular Button code
             if ( isOnButton && !audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = TRUE;
                 toggleButton(i);
-                qDebug("button toggled %d",i);
+                qDebug("button toggled1  %d",i);
                 switch (i) {
                   case AudioVolumeUp:   emit moreClicked(); return;
                   case AudioVolumeDown: emit lessClicked(); return;
                 }
             } else if ( !isOnButton && audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = FALSE;
                 toggleButton(i);
+                qDebug("button toggled2  %d",i);
             }
         } else {
             if ( audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = FALSE;
                 if ( !audioButtons[i].isToggle )
                     setToggleButton( i, FALSE );
+                qDebug("button toggled3  %d",i);
                 switch (i) {
                   case AudioPlay:       mediaPlayerState->setPlaying(audioButtons[i].isDown); return;
                   case AudioStop:       mediaPlayerState->setPlaying(FALSE); return;
                   case AudioPause:      mediaPlayerState->setPaused(audioButtons[i].isDown); return;
                   case AudioNext:       mediaPlayerState->setNext(); return;
                   case AudioPrevious:   mediaPlayerState->setPrev(); return;
                   case AudioLoop:       mediaPlayerState->setLooping(audioButtons[i].isDown); return;
                   case AudioVolumeUp:   emit moreReleased(); return;
                   case AudioVolumeDown: emit lessReleased(); return;
                   case AudioPlayList:   mediaPlayerState->setList();  return;
                 }
             }
diff --git a/core/multimedia/opieplayer/audiowidget.h b/core/multimedia/opieplayer/audiowidget.h
index a2850aa..d1d72b6 100644
--- a/core/multimedia/opieplayer/audiowidget.h
+++ b/core/multimedia/opieplayer/audiowidget.h
@@ -8,24 +8,25 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
+
 #ifndef AUDIO_WIDGET_H
 #define AUDIO_WIDGET_H
 
 #include <qwidget.h>
 #include <qpainter.h>
 #include <qdrawutil.h>
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qslider.h>
 #include <qframe.h>
 
 
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp
index 4b2827e..b9f96de 100644
--- a/core/multimedia/opieplayer/loopcontrol.cpp
+++ b/core/multimedia/opieplayer/loopcontrol.cpp
@@ -10,25 +10,24 @@
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 // L.J.Potter added changes Fri 02-15-2002
 
-
 #include <qpe/qpeapplication.h>
 
 #ifdef Q_WS_QWS
 #include <qpe/qcopenvelope_qws.h>
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
 #include <errno.h>
 #include <unistd.h>
 #include "loopcontrol.h"
@@ -212,47 +211,48 @@ void LoopControl::startVideo() {
 
       moreVideo = FALSE;
       killTimer( videoId );
 
   }
 
     }
 }
 
 
 void LoopControl::startAudio() {
     
+//qDebug("start audio");
     audioMutex->lock();
     if ( moreAudio ) {
 
   if ( !isMuted && mediaPlayerState->curDecoder() ) {
 
       currentSample = audioSampleCounter + 1;
 
       if ( currentSample != audioSampleCounter + 1 )
     qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter);
 
       long samplesRead = 0;
       bool readOk=mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream );
       long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000;
       long sampleWaitTime = currentSample - sampleWeShouldBeAt;
 
-//             if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) {
-//           usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) );
-//             }
-//           else if ( sampleWaitTime <= -5000 ) {
-//    //      qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
-//          //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
-//          currentSample = sampleWeShouldBeAt;
-//            }
+//         if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) {
+//       usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) );
+//         }
+//       else if ( sampleWaitTime <= -5000 ) {
+//      qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
+//      //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
+//      currentSample = sampleWeShouldBeAt;
+//        }
 
       audioDevice->write( audioBuffer, samplesRead * 2 * channels );
       audioSampleCounter = currentSample + samplesRead - 1;
 
       moreAudio = readOk && (audioSampleCounter <= total_audio_samples);
 
   } else {
 
       moreAudio = FALSE;
 
   }
 
@@ -369,45 +369,43 @@ bool LoopControl::init( const QString& filename ) {
     if ( !mediaPlayerState->curDecoder()|| !mediaPlayerState->curDecoder()->open( filename ) ) {
   audioMutex->unlock();
   return FALSE;
     }
 
     hasAudioChannel = mediaPlayerState->curDecoder()->audioStreams() > 0;
     hasVideoChannel = mediaPlayerState->curDecoder()->videoStreams() > 0;
 
     if ( hasAudioChannel ) {
   int astream = 0;
 
   channels = mediaPlayerState->curDecoder()->audioChannels( astream );
-//   qDebug( "LC- channels = %d", channels );
+  qDebug( "LC- channels = %d", channels );
   
   if ( !total_audio_samples )
       total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream );
 
 //  total_audio_samples += 1000;
 
   mediaPlayerState->setLength( total_audio_samples );
   
   freq = mediaPlayerState->curDecoder()->audioFrequency( astream );
-//    qDebug( "LC- frequency = %d", freq );
+  qDebug( "LC- frequency = %d", freq );
 
   audioSampleCounter = 0;
    int bits_per_sample;
-   if ( mediaPlayerState->curDecoder()->pluginName() == QString("WavPlugin") ) {
+   if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibWavPlugin") ) {
        bits_per_sample =(int) mediaPlayerState->curDecoder()->getTime();
-//         qDebug("using stupid hack");
+       qDebug("using stupid hack");
    } else {
-       bits_per_sample=0;
-//       freq=44100;
-       channels=2;
+           bits_per_sample=0;
    }
 
   audioDevice = new AudioDevice( freq, channels, bits_per_sample);
   audioBuffer = new char[ audioDevice->bufferSize() ];
   channels = audioDevice->channels();
 
   //### must check which frequency is actually used.
   static const int size = 1;
   short int buf[size];
   long samplesRead = 0;
   mediaPlayerState->curDecoder()->audioReadSamples( buf, channels, size, samplesRead, stream );
     }
diff --git a/core/multimedia/opieplayer/mpegplayer.pro b/core/multimedia/opieplayer/mpegplayer.pro
index b9e9ffe..241e29e 100644
--- a/core/multimedia/opieplayer/mpegplayer.pro
+++ b/core/multimedia/opieplayer/mpegplayer.pro
@@ -13,14 +13,14 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lpthread
 
 # INTERFACES  = 
 # INCLUDEPATH += $(OPIEDIR)/include
 # CONFIG+=static
 # TMAKE_CXXFLAGS += -DQPIM_STANDALONE
 # LIBS    += libmpeg3/libmpeg3.a -lpthread
 # LIBS    += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 
-TRANSLATIONS = ../i18n/de/mpegplayer.ts
+TRANSLATIONS += ../i18n/de/mpegplayer.ts
 TRANSLATIONS += ../i18n/pt_BR/mpegplayer.ts
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp
index 991301a..756e3b4 100644
--- a/core/multimedia/opieplayer/playlistselection.cpp
+++ b/core/multimedia/opieplayer/playlistselection.cpp
@@ -46,45 +46,45 @@ private:
     const DocLnk *fl;
 };
 
 
 PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
     : QListView( parent, name )
 {
     qDebug("starting playlistselector");
 // #ifdef USE_PLAYLIST_BACKGROUND
 //    setStaticBackground( TRUE );
 //      setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) );
 
-    setBackgroundPixmap( Resource::loadPixmap( "launcher/opielogo" ) );
+//      setBackgroundPixmap( Resource::loadPixmap( "launcher/opielogo" ) );
 // #endif
 //      addColumn("Title",236);
 //      setAllColumnsShowFocus( TRUE );
      addColumn( tr( "Playlist Selection" ) );
     header()->hide();
     setSorting( -1, FALSE );
 }
 
 
 PlayListSelection::~PlayListSelection() {
 }
 
 
 // #ifdef USE_PLAYLIST_BACKGROUND
 void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) {
 //  qDebug("drawBackground");
    p->fillRect( r, QBrush( white ) );
-      QImage logo = Resource::loadImage( "launcher/opielogo" );
-        if ( !logo.isNull() )
-      p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo );
+//        QImage logo = Resource::loadImage( "launcher/opielogo" );
+//          if ( !logo.isNull() )
+//        p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo );
 }
 // #endif
 
 
 void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) {
     if ( event->state() == QMouseEvent::LeftButton ) {
   QListViewItem *currentItem = selectedItem();
   QListViewItem *itemUnder = itemAt( QPoint( event->pos().x(), event->pos().y() - contentsY() ) );
   if ( currentItem && currentItem->itemAbove() == itemUnder )
       moveSelectedUp();
   else if ( currentItem && currentItem->itemBelow() == itemUnder )
       moveSelectedDown();
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 524747e..cf665c8 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -97,24 +97,25 @@ public:
   addTo( parent );
     }
 };
 
 
 PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     : QMainWindow( parent, name, fl ) {
 
     d = new PlayListWidgetPrivate;
     d->setDocumentUsed = FALSE;
     d->current = NULL;
     fromSetDocument = FALSE;
+    insanityBool=FALSE;
 //    menuTimer = new QTimer( this ,"menu timer"),
 //     connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) );
 
     setBackgroundMode( PaletteButton );
 
     setCaption( tr("OpiePlayer") );
     setIcon( Resource::loadPixmap( "MPEGPlayer" ) );
 
     setToolBarsMovable( FALSE );
 
     // Create Toolbar
     QPEToolBar *toolbar = new QPEToolBar( this );
@@ -197,27 +198,27 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
           
      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->addColumn( "Title",140);
+    audioView->addColumn("Size", -1);
+    audioView->addColumn("Media",-1);
     audioView->setColumnAlignment(1, Qt::AlignRight);
     audioView->setColumnAlignment(2, Qt::AlignRight);
     audioView->setAllColumnsShowFocus(TRUE);
     tabWidget->insertTab(aTab,"Audio");
 
     QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold);
     connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
     
 
 //    audioView
      Global::findDocuments(&files, "audio/*");
@@ -232,27 +233,27 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
          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->addColumn("Title",140);
+    videoView->addColumn("Size",-1);
+    videoView->addColumn("Media",-1);
     videoView->setColumnAlignment(1, Qt::AlignRight);
     videoView->setColumnAlignment(2, Qt::AlignRight);
     videoView->setAllColumnsShowFocus(TRUE);
     QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold);
     connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
 
     tabWidget->insertTab( vTab,"Video");
 
     Global::findDocuments(&vFiles, "video/*");
     QListIterator<DocLnk> Vdit( vFiles.children() );
     for ( ; Vdit.current(); ++Vdit ) {
@@ -477,56 +478,68 @@ const DocLnk *PlayListWidget::current() { // this is fugly
 //      if( fromSetDocument) {
 //          qDebug("from setDoc");
 //          DocLnkSet files;
 //          Global::findDocuments(&files, "video/*;audio/*");
 //          QListIterator<DocLnk> dit( files.children() );
 //          for ( ; dit.current(); ++dit ) {
 //              if(dit.current()->linkFile() ==  setDocFileRef) {
 //                  qDebug(setDocFileRef);  
 //                  return dit;
 //              }
 //          }
 //      } else
-        switch (tabWidget->currentPageIndex()) {
-          case 0: //playlist
-          {
-              if ( mediaPlayerState->playlist() ) {
-                  return d->selectedFiles->current();
-              }
-              else if ( d->setDocumentUsed && d->current ) {
-                  return d->current;
-              } else {
-                  return d->files->selected();
-              }
+//    qDebug("current");
+//     switch (tabWidget->currentPageIndex()) {
+//          case 0: //playlist
+//          {
+          qDebug("playlist");
+          if ( mediaPlayerState->playlist() ) {
+              return d->selectedFiles->current();
           }
-          break;
-          case 1: { //audio
-              Global::findDocuments(&files, "audio/*");
-              QListIterator<DocLnk> dit( files.children() );
-              for ( ; dit.current(); ++dit ) {
-                  if( dit.current()->name() == audioView->currentItem()->text(0))
-                      return dit;
-              }
-          }           
-              break;
-          case 2: { // video
-              Global::findDocuments(&vFiles, "video/*");
-              QListIterator<DocLnk> Vdit( vFiles.children() );
-              for ( ; Vdit.current(); ++Vdit ) {
-                  if( Vdit.current()->name() == videoView->currentItem()->text(0))
-                      return Vdit;
-              }      
+          else if ( d->setDocumentUsed && d->current ) {
+              return d->current;
+          } else {
+              return d->files->selected();
           }
-              break;
-        };
+//        }
+//        break;
+//        case 1://audio
+//        {
+//            qDebug("audioView");
+//            Global::findDocuments(&files, "audio/*");
+//            QListIterator<DocLnk> dit( files.children() );
+//            for ( ; dit.current(); ++dit ) {
+//                if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) {
+//                    qDebug("here");
+//                    insanityBool=TRUE;
+//                    return dit;
+//                }
+//            }
+//        }           
+//        break;
+//        case 2: // video
+//        {
+//            qDebug("videoView");
+//            Global::findDocuments(&vFiles, "video/*");
+//            QListIterator<DocLnk> Vdit( vFiles.children() );
+//            for ( ; Vdit.current(); ++Vdit ) {
+//                if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) {
+//                    insanityBool=TRUE;
+//                    return Vdit;
+//                }
+//            }
+//        }
+//        break;
+//      };
+//  return 0;
 }
 
 bool PlayListWidget::prev() {
     if ( mediaPlayerState->playlist() ) {
   if ( mediaPlayerState->shuffled() ) {
       const DocLnk *cur = current();
       int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
       for ( int i = 0; i < j; i++ ) {
     if ( !d->selectedFiles->next() )
         d->selectedFiles->first();
       }
       if ( cur == current() )
@@ -645,36 +658,67 @@ void PlayListWidget::setPlaylist( bool shown ) {
   d->playListFrame->hide();
 }
 
 void PlayListWidget::setView( char view ) {
     if ( view == 'l' )
   showMaximized();
     else
   hide();
 }
 
 void PlayListWidget::addSelected() {
 
-    switch (tabWidget->currentPageIndex()) {
-      case 0: //playlist
-          break;
-      case 1: { //audio
-          addToSelection( audioView->selectedItem() );
-      }           
-          break;
-      case 2: { // video
-          addToSelection( videoView->selectedItem() );
-      }
-          break;
-    };
+      Config cfg( "MediaPlayer" );
+      cfg.setGroup("PlayList");
+      QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
+      int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
+
+      switch (tabWidget->currentPageIndex()) {
+        case 0: //playlist
+            break;
+        case 1: { //audio
+            for ( int i = 0; i < noOfFiles; i++ ) {
+                QString entryName;
+                entryName.sprintf( "File%i", i + 1 );
+                QString linkFile = cfg.readEntry( entryName );
+                  if( DocLnk( linkFile).name() == audioView->selectedItem()->text(0) ) {
+                      int result= QMessageBox::warning(this,"OpiePlayer",
+                                  tr("This is all ready in your playlist.\nContinue?"),
+                                  tr("Yes"),tr("No"),0,0,1);
+                      if (result !=0)
+                          return;
+                  }
+            }
+            addToSelection( audioView->selectedItem() );
+            tabWidget->setCurrentPage(1);
+        }           
+        break;
+        case 2: { // video
+            for ( int i = 0; i < noOfFiles; i++ ) {
+                QString entryName;
+                entryName.sprintf( "File%i", i + 1 );
+                QString linkFile = cfg.readEntry( entryName );
+                  if( DocLnk( linkFile).name() == videoView->selectedItem()->text(0) ) {
+                      int result= QMessageBox::warning(this,"OpiePlayer",
+                                  tr("This is all ready in your playlist.\nContinue?"),
+                                  tr("Yes"),tr("No"),0,0,1);
+                      if (result !=0)
+                          return;
+                  }
+            }
+            addToSelection( videoView->selectedItem() );
+            tabWidget->setCurrentPage(2);
+        }
+        break;
+      };
 }
 
 void PlayListWidget::removeSelected() {
     d->selectedFiles->removeSelected( );
 }
 
 
 void PlayListWidget::playIt( QListViewItem *it) {
 //   d->setDocumentUsed = FALSE;
         mediaPlayerState->setPlaying(TRUE);
 }
 
@@ -746,25 +790,56 @@ void PlayListWidget::tabChanged(QWidget *widg) {
           if( tbDeletePlaylist->isHidden())
               tbDeletePlaylist->show();
           playLists->reread();
       }
       break;
     };
 }
 
 
 /*
   play button is pressed*/
 void PlayListWidget::btnPlay(bool b) {
-    mediaPlayerState->setPlaying(b);
+//    mediaPlayerState->setPlaying(b);
+    switch ( tabWidget->currentPageIndex()) {
+      case 0:
+      {
+          mediaPlayerState->setPlaying(b);
+      }
+      break;
+      case 1:
+      {
+          addToSelection( audioView->selectedItem() );
+          mediaPlayerState->setPlaying(b);
+//            qApp->processEvents();
+          d->selectedFiles->removeSelected( );
+          tabWidget->setCurrentPage(1);
+//            mediaPlayerState->setPlaying(FALSE);
+      }
+      break;
+      case 2:
+      {
+          addToSelection( videoView->selectedItem() );
+          mediaPlayerState->setPlaying(b);
+          qApp->processEvents();
+          d->selectedFiles->removeSelected( );
+          tabWidget->setCurrentPage(2);
+//            mediaPlayerState->setPlaying(FALSE);
+      }
+      break;
+    };
+
+
+
+    
 }
 
 void PlayListWidget::deletePlaylist() {
     switch( QMessageBox::information( this, (tr("Remove Playlist?")),
                                       (tr("You really want to delete\nthis playlist?")),
                                       (tr("Yes")), (tr("No")), 0 )){
         case 0: // Yes clicked,
             QFile().remove(playLists->selected()->file());
             QFile().remove(playLists->selected()->linkFile());
             playLists->reread();
             break;
         case 1: // Cancel
diff --git a/core/multimedia/opieplayer/playlistwidget.h b/core/multimedia/opieplayer/playlistwidget.h
index effc600..10a42df 100644
--- a/core/multimedia/opieplayer/playlistwidget.h
+++ b/core/multimedia/opieplayer/playlistwidget.h
@@ -40,24 +40,25 @@ 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;
     bool fromSetDocument;
+    bool insanityBool;
     QString setDocFileRef;
     // retrieve the current playlist entry (media file link)
     const DocLnk *current();
     void useSelectedDocument();
 /*     QTimer    * menuTimer; */
     FileSelector*  playLists;
     QPushButton *tbDeletePlaylist;
 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 setActiveWindow(); // need to handle this to show the right view
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index bb5f9e8..23b36e5 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -194,35 +194,36 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
             QPoint dXY = center - event->pos();
             int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y();
             bool isOnButton = dist <= (radius * radius);
             if ( isOnButton != videoButtons[i].isHeld ) {
                 videoButtons[i].isHeld = isOnButton;
                 toggleButton(i);
             }
         } else {
             if ( videoButtons[i].isHeld ) {
                 videoButtons[i].isHeld = FALSE;
                 if ( !videoButtons[i].isToggle ) 
                     setToggleButton( i, FALSE );
-                switch (i) {
-                  case VideoPlay:       mediaPlayerState->setPlaying(videoButtons[i].isDown); return;
-                  case VideoStop:       mediaPlayerState->setPlaying(FALSE); return;
-                  case VideoPause:      mediaPlayerState->setPaused(videoButtons[i].isDown); return;
-                  case VideoNext:       mediaPlayerState->setNext(); return;
-                  case VideoPrevious:   mediaPlayerState->setPrev(); return;
-                  case VideoPlayList:   mediaPlayerState->setList(); return;
-                  case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
-                }
             }
         }
+        switch (i) {
+          case VideoPlay:       mediaPlayerState->setPlaying(videoButtons[i].isDown); return;
+          case VideoStop:       mediaPlayerState->setPlaying(FALSE); return;
+          case VideoPause:      mediaPlayerState->setPaused(videoButtons[i].isDown); return;
+          case VideoNext:       mediaPlayerState->setNext(); return;
+          case VideoPrevious:   mediaPlayerState->setPrev(); return;
+          case VideoPlayList:   mediaPlayerState->setList(); return;
+          case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
+        }
+        
     }
 }
 
 
 void VideoWidget::mousePressEvent( QMouseEvent *event ) {
     mouseMoveEvent( event );
 }
 
 
 void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
     if ( mediaPlayerState->fullscreen() ) {
   mediaPlayerState->setFullscreen( FALSE );