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
@@ -49,4 +49,6 @@
#include "mediaplayerstate.h"
+#include "playlistwidget.h"
extern MediaPlayerState *mediaPlayerState;
+extern PlayListWidget *playList;
@@ -227,2 +229,3 @@ AudioWidget::~AudioWidget() {
}
+// mediaPlayerState->setPlaying(false);
}
@@ -471,4 +474,4 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
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;
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
@@ -46,2 +46,3 @@
#include "mediaplayerstate.h"
+#include "playlistwidget.h"
@@ -56,2 +57,3 @@
extern MediaPlayerState *mediaPlayerState;
+extern PlayListWidget *playList;
@@ -340,4 +342,4 @@ 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;