ignore next and prev buttons when playing from filelist, for now

2 files changed, 9 insertions, 4 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 446fa45..7c49733 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -44,14 +44,16 @@
 
 #include <stdlib.h>
 #include <stdio.h>
 
 #include "audiowidget.h"
 #include "mediaplayerstate.h"
+#include "playlistwidget.h"
 
 extern MediaPlayerState *mediaPlayerState;
+extern PlayListWidget *playList;
 
 static const int xo = -2; // movable x offset
 static const int yo = 22; // movable y offset
 
 
 Ticker::Ticker( QWidget* parent=0 ) : QFrame( parent ) {
@@ -222,12 +224,13 @@ AudioWidget::~AudioWidget() {
     delete imgUp;
     delete imgDn;
     delete imgButtonMask;
     for ( int i = 0; i < 10; i++ ) {
         delete masks[i];
     }
+//    mediaPlayerState->setPlaying(false);
 }
 
 namespace {
 
 QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
     QPixmap pix( img.width(), img.height() );
@@ -466,14 +469,14 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
                         return;
                     } else {
                         //  setToggleButton( i, TRUE );
                         // mediaPlayerState->setPlaying( videoButtons[i].isDown );
                     }
                 case AudioStop:       mediaPlayerState->setPlaying(FALSE); return;
-                case AudioNext:       mediaPlayerState->setNext(); return;
-                case AudioPrevious:   mediaPlayerState->setPrev(); return;
+                  case AudioNext:  if(playList->whichList() ==0) mediaPlayerState->setNext(); return;
+                case AudioPrevious:  if(playList->whichList() ==0) 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;
                 case AudioForward:    emit forwardReleased(); return;
                 case AudioBack:       emit backReleased(); return;
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index ffda2e4..8e3a365 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -41,22 +41,24 @@
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qslider.h>
 #include <qdrawutil.h>
 #include "videowidget.h"
 #include "mediaplayerstate.h"
+#include "playlistwidget.h"
 
 
 #ifdef Q_WS_QWS
 # define USE_DIRECT_PAINTER
 # include <qdirectpainter_qws.h>
 # include <qgfxraster_qws.h>
 #endif
 
 
 extern MediaPlayerState *mediaPlayerState;
+extern PlayListWidget *playList;
 
 
 static const int xo = 2; // movable x offset
 static const int yo = 0; // movable y offset
 
 
@@ -335,14 +337,14 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
                     } else {
                         return;
                     }
                 }
 
                 case VideoStop:       mediaPlayerState->setPlaying( FALSE ); return;
-                case VideoNext:       mediaPlayerState->setNext(); return;
-                case VideoPrevious:   mediaPlayerState->setPrev(); return;
+                case VideoNext:       if(playList->whichList() ==0) mediaPlayerState->setNext(); return;
+                case VideoPrevious:   if(playList->whichList() ==0) mediaPlayerState->setPrev(); return;
                 case VideoVolUp:      emit moreReleased(); return;
                 case VideoVolDown:    emit lessReleased(); return;
                 case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
                 }
             }
         }