Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 7 |
1 files changed, 5 insertions, 2 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; |