summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp7
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp6
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
@@ -47,8 +47,10 @@
#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
@@ -225,6 +227,7 @@ AudioWidget::~AudioWidget() {
for ( int i = 0; i < 10; i++ ) {
delete masks[i];
}
+// mediaPlayerState->setPlaying(false);
}
namespace {
@@ -469,8 +472,8 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
// 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;
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
@@ -44,6 +44,7 @@
#include <qdrawutil.h>
#include "videowidget.h"
#include "mediaplayerstate.h"
+#include "playlistwidget.h"
#ifdef Q_WS_QWS
@@ -54,6 +55,7 @@
extern MediaPlayerState *mediaPlayerState;
+extern PlayListWidget *playList;
static const int xo = 2; // movable x offset
@@ -338,8 +340,8 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
}
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;