-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 7 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 6 |
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 | |||
@@ -46,10 +46,12 @@ | |||
46 | #include <stdio.h> | 46 | #include <stdio.h> |
47 | 47 | ||
48 | #include "audiowidget.h" | 48 | #include "audiowidget.h" |
49 | #include "mediaplayerstate.h" | 49 | #include "mediaplayerstate.h" |
50 | #include "playlistwidget.h" | ||
50 | 51 | ||
51 | extern MediaPlayerState *mediaPlayerState; | 52 | extern MediaPlayerState *mediaPlayerState; |
53 | extern PlayListWidget *playList; | ||
52 | 54 | ||
53 | static const int xo = -2; // movable x offset | 55 | static const int xo = -2; // movable x offset |
54 | static const int yo = 22; // movable y offset | 56 | static const int yo = 22; // movable y offset |
55 | 57 | ||
@@ -224,8 +226,9 @@ AudioWidget::~AudioWidget() { | |||
224 | delete imgButtonMask; | 226 | delete imgButtonMask; |
225 | for ( int i = 0; i < 10; i++ ) { | 227 | for ( int i = 0; i < 10; i++ ) { |
226 | delete masks[i]; | 228 | delete masks[i]; |
227 | } | 229 | } |
230 | // mediaPlayerState->setPlaying(false); | ||
228 | } | 231 | } |
229 | 232 | ||
230 | namespace { | 233 | namespace { |
231 | 234 | ||
@@ -468,10 +471,10 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
468 | // setToggleButton( i, TRUE ); | 471 | // setToggleButton( i, TRUE ); |
469 | // mediaPlayerState->setPlaying( videoButtons[i].isDown ); | 472 | // mediaPlayerState->setPlaying( videoButtons[i].isDown ); |
470 | } | 473 | } |
471 | case AudioStop: mediaPlayerState->setPlaying(FALSE); return; | 474 | case AudioStop: mediaPlayerState->setPlaying(FALSE); return; |
472 | case AudioNext: mediaPlayerState->setNext(); return; | 475 | case AudioNext: if(playList->whichList() ==0) mediaPlayerState->setNext(); return; |
473 | case AudioPrevious: mediaPlayerState->setPrev(); return; | 476 | case AudioPrevious: if(playList->whichList() ==0) mediaPlayerState->setPrev(); return; |
474 | case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return; | 477 | case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return; |
475 | case AudioVolumeUp: emit moreReleased(); return; | 478 | case AudioVolumeUp: emit moreReleased(); return; |
476 | case AudioVolumeDown: emit lessReleased(); return; | 479 | case AudioVolumeDown: emit lessReleased(); return; |
477 | case AudioPlayList: mediaPlayerState->setList(); return; | 480 | case AudioPlayList: mediaPlayerState->setList(); 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 | |||
@@ -43,8 +43,9 @@ | |||
43 | #include <qslider.h> | 43 | #include <qslider.h> |
44 | #include <qdrawutil.h> | 44 | #include <qdrawutil.h> |
45 | #include "videowidget.h" | 45 | #include "videowidget.h" |
46 | #include "mediaplayerstate.h" | 46 | #include "mediaplayerstate.h" |
47 | #include "playlistwidget.h" | ||
47 | 48 | ||
48 | 49 | ||
49 | #ifdef Q_WS_QWS | 50 | #ifdef Q_WS_QWS |
50 | # define USE_DIRECT_PAINTER | 51 | # define USE_DIRECT_PAINTER |
@@ -53,8 +54,9 @@ | |||
53 | #endif | 54 | #endif |
54 | 55 | ||
55 | 56 | ||
56 | extern MediaPlayerState *mediaPlayerState; | 57 | extern MediaPlayerState *mediaPlayerState; |
58 | extern PlayListWidget *playList; | ||
57 | 59 | ||
58 | 60 | ||
59 | static const int xo = 2; // movable x offset | 61 | static const int xo = 2; // movable x offset |
60 | static const int yo = 0; // movable y offset | 62 | static const int yo = 0; // movable y offset |
@@ -337,10 +339,10 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
337 | } | 339 | } |
338 | } | 340 | } |
339 | 341 | ||
340 | case VideoStop: mediaPlayerState->setPlaying( FALSE ); return; | 342 | case VideoStop: mediaPlayerState->setPlaying( FALSE ); return; |
341 | case VideoNext: mediaPlayerState->setNext(); return; | 343 | case VideoNext: if(playList->whichList() ==0) mediaPlayerState->setNext(); return; |
342 | case VideoPrevious: mediaPlayerState->setPrev(); return; | 344 | case VideoPrevious: if(playList->whichList() ==0) mediaPlayerState->setPrev(); return; |
343 | case VideoVolUp: emit moreReleased(); return; | 345 | case VideoVolUp: emit moreReleased(); return; |
344 | case VideoVolDown: emit lessReleased(); return; | 346 | case VideoVolDown: emit lessReleased(); return; |
345 | case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return; | 347 | case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return; |
346 | } | 348 | } |