author | simon <simon> | 2002-12-02 20:56:19 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 20:56:19 (UTC) |
commit | 649ea9e9586ce51847ebeb9c062290137c9248f4 (patch) (side-by-side diff) | |
tree | 334d6fe0fe91e29ed3600d96443ab104939c1eef /noncore/multimedia/opieplayer2/audiowidget.cpp | |
parent | 0090a335a7162f4b0d34f78850ebf9a8bd544c01 (diff) | |
download | opie-649ea9e9586ce51847ebeb9c062290137c9248f4.zip opie-649ea9e9586ce51847ebeb9c062290137c9248f4.tar.gz opie-649ea9e9586ce51847ebeb9c062290137c9248f4.tar.bz2 |
- centralized the button command handling into MediaWidget (as it is
duplicated between AudioWidget and VideoWidget -- the latter still to
come though)
Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index d9beb90..3070bc3 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp @@ -50,8 +50,6 @@ #include "mediaplayerstate.h" #include "playlistwidget.h" -extern PlayListWidget *playList; - static const int xo = -2; // movable x offset static const int yo = 22; // movable y offset @@ -393,16 +391,16 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { audioButtons[i].isHeld = TRUE; toggleButton(i); switch (i) { - case AudioVolumeUp: + case VolumeUp: emit moreClicked(); return; - case AudioVolumeDown: + case VolumeDown: emit lessClicked(); return; - case AudioForward: + case Forward: emit forwardClicked(); return; - case AudioBack: + case Back: emit backClicked(); return; } @@ -417,25 +415,7 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { setToggleButton( i, FALSE ); } qDebug("mouseEvent %d", i); - switch (i) { - case AudioPlay: - if( mediaPlayerState.isPaused() ) { - mediaPlayerState.setPaused( FALSE ); - return; - } else if( !mediaPlayerState.isPaused() ) { - mediaPlayerState.setPaused( TRUE ); - return; - } - case AudioStop: mediaPlayerState.setPlaying(FALSE); return; - case AudioNext: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; - case AudioPrevious: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) 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; - } + handleCommand( static_cast<Command>( i ), audioButtons[ i ].isDown ); } } } |