-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 30 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 24 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 19 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 10 |
4 files changed, 35 insertions, 48 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 | |||
@@ -51,6 +51,4 @@ | |||
51 | #include "playlistwidget.h" | 51 | #include "playlistwidget.h" |
52 | 52 | ||
53 | extern PlayListWidget *playList; | ||
54 | |||
55 | static const int xo = -2; // movable x offset | 53 | static const int xo = -2; // movable x offset |
56 | static const int yo = 22; // movable y offset | 54 | static const int yo = 22; // movable y offset |
@@ -394,14 +392,14 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
394 | toggleButton(i); | 392 | toggleButton(i); |
395 | switch (i) { | 393 | switch (i) { |
396 | case AudioVolumeUp: | 394 | case VolumeUp: |
397 | emit moreClicked(); | 395 | emit moreClicked(); |
398 | return; | 396 | return; |
399 | case AudioVolumeDown: | 397 | case VolumeDown: |
400 | emit lessClicked(); | 398 | emit lessClicked(); |
401 | return; | 399 | return; |
402 | case AudioForward: | 400 | case Forward: |
403 | emit forwardClicked(); | 401 | emit forwardClicked(); |
404 | return; | 402 | return; |
405 | case AudioBack: | 403 | case Back: |
406 | emit backClicked(); | 404 | emit backClicked(); |
407 | return; | 405 | return; |
@@ -418,23 +416,5 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
418 | } | 416 | } |
419 | qDebug("mouseEvent %d", i); | 417 | qDebug("mouseEvent %d", i); |
420 | switch (i) { | 418 | handleCommand( static_cast<Command>( i ), audioButtons[ i ].isDown ); |
421 | case AudioPlay: | ||
422 | if( mediaPlayerState.isPaused() ) { | ||
423 | mediaPlayerState.setPaused( FALSE ); | ||
424 | return; | ||
425 | } else if( !mediaPlayerState.isPaused() ) { | ||
426 | mediaPlayerState.setPaused( TRUE ); | ||
427 | return; | ||
428 | } | ||
429 | case AudioStop: mediaPlayerState.setPlaying(FALSE); return; | ||
430 | case AudioNext: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; | ||
431 | case AudioPrevious: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; | ||
432 | case AudioLoop: mediaPlayerState.setLooping(audioButtons[i].isDown); return; | ||
433 | case AudioVolumeUp: emit moreReleased(); return; | ||
434 | case AudioVolumeDown: emit lessReleased(); return; | ||
435 | case AudioPlayList: mediaPlayerState.setList(); return; | ||
436 | case AudioForward: emit forwardReleased(); return; | ||
437 | case AudioBack: emit backReleased(); return; | ||
438 | } | ||
439 | } | 419 | } |
440 | } | 420 | } |
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 087d711..1778a30 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -50,20 +50,4 @@ | |||
50 | class QPixmap; | 50 | class QPixmap; |
51 | 51 | ||
52 | namespace { | ||
53 | |||
54 | enum AudioButtons { | ||
55 | AudioPlay=0, | ||
56 | AudioStop, | ||
57 | AudioNext, | ||
58 | AudioPrevious, | ||
59 | AudioVolumeUp, | ||
60 | AudioVolumeDown, | ||
61 | AudioLoop, | ||
62 | AudioPlayList, | ||
63 | AudioForward, | ||
64 | AudioBack | ||
65 | }; | ||
66 | }; | ||
67 | |||
68 | class AudioWidget : public MediaWidget { | 52 | class AudioWidget : public MediaWidget { |
69 | Q_OBJECT | 53 | Q_OBJECT |
@@ -76,5 +60,5 @@ public slots: | |||
76 | void sliderPressed( ); | 60 | void sliderPressed( ); |
77 | void sliderReleased( ); | 61 | void sliderReleased( ); |
78 | void setLooping( bool b) { setToggleButton( AudioLoop, b ); } | 62 | void setLooping( bool b) { setToggleButton( Loop, b ); } |
79 | void setPosition( long ); | 63 | void setPosition( long ); |
80 | void setSeekable( bool ); | 64 | void setSeekable( bool ); |
@@ -82,5 +66,5 @@ public slots: | |||
82 | public: | 66 | public: |
83 | virtual void setLength( long ); | 67 | virtual void setLength( long ); |
84 | virtual void setPlaying( bool b) { setToggleButton( AudioPlay, b ); } | 68 | virtual void setPlaying( bool b) { setToggleButton( Play, b ); } |
85 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); | 69 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); |
86 | 70 | ||
@@ -88,10 +72,6 @@ signals: | |||
88 | void moreClicked(); | 72 | void moreClicked(); |
89 | void lessClicked(); | 73 | void lessClicked(); |
90 | void moreReleased(); | ||
91 | void lessReleased(); | ||
92 | void forwardClicked(); | 74 | void forwardClicked(); |
93 | void backClicked(); | 75 | void backClicked(); |
94 | void forwardReleased(); | ||
95 | void backReleased(); | ||
96 | void sliderMoved(long); | 76 | void sliderMoved(long); |
97 | 77 | ||
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index d58e87e..01a7295 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -20,6 +20,7 @@ | |||
20 | 20 | ||
21 | #include "mediawidget.h" | 21 | #include "mediawidget.h" |
22 | #include "playlistwidget.h" | ||
22 | 23 | ||
23 | extern MediaPlayerState *mediaPlayerState; | 24 | extern PlayListWidget *playList; |
24 | 25 | ||
25 | MediaWidget::MediaWidget( MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name ) | 26 | MediaWidget::MediaWidget( MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name ) |
@@ -38,4 +39,20 @@ MediaWidget::~MediaWidget() | |||
38 | } | 39 | } |
39 | 40 | ||
41 | void MediaWidget::handleCommand( Command command, bool buttonDown ) | ||
42 | { | ||
43 | switch ( command ) { | ||
44 | case Play: mediaPlayerState.togglePaused(); | ||
45 | case Stop: mediaPlayerState.setPlaying(FALSE); return; | ||
46 | case Next: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; | ||
47 | case Previous: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; | ||
48 | case Loop: mediaPlayerState.setLooping( buttonDown ); return; | ||
49 | case VolumeUp: emit moreReleased(); return; | ||
50 | case VolumeDown: emit lessReleased(); return; | ||
51 | case PlayList: mediaPlayerState.setList(); return; | ||
52 | case Forward: emit forwardReleased(); return; | ||
53 | case Back: emit backReleased(); return; | ||
54 | } | ||
55 | } | ||
56 | |||
40 | /* vim: et sw=4 ts=4 | 57 | /* vim: et sw=4 ts=4 |
41 | */ | 58 | */ |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 64adba9..550f0fc 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -29,4 +29,6 @@ class MediaWidget : public QWidget | |||
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | public: | 30 | public: |
31 | enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back }; | ||
32 | |||
31 | MediaWidget( MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); | 33 | MediaWidget( MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); |
32 | virtual ~MediaWidget(); | 34 | virtual ~MediaWidget(); |
@@ -37,5 +39,13 @@ public slots: | |||
37 | virtual void setPlaying( bool playing ) = 0; | 39 | virtual void setPlaying( bool playing ) = 0; |
38 | 40 | ||
41 | signals: | ||
42 | void moreReleased(); | ||
43 | void lessReleased(); | ||
44 | void forwardReleased(); | ||
45 | void backReleased(); | ||
46 | |||
39 | protected: | 47 | protected: |
48 | void handleCommand( Command command, bool buttonDown ); | ||
49 | |||
40 | MediaPlayerState &mediaPlayerState; | 50 | MediaPlayerState &mediaPlayerState; |
41 | }; | 51 | }; |