-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 9 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 33 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 11 |
5 files changed, 30 insertions, 28 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 092e5ce..9b276b5 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -61,3 +61,3 @@ public slots: | |||
61 | void sliderReleased( ); | 61 | void sliderReleased( ); |
62 | void setLooping( bool b) { setToggleButton( buttons[ Loop ], b ); } | 62 | void setLooping( bool b) { setToggleButton( Loop, b ); } |
63 | void setPosition( long ); | 63 | void setPosition( long ); |
@@ -67,3 +67,3 @@ public: | |||
67 | virtual void setLength( long ); | 67 | virtual void setLength( long ); |
68 | virtual void setPlaying( bool b) { setToggleButton( buttons[ Play ], b ); } | 68 | virtual void setPlaying( bool b) { setToggleButton( Play, b ); } |
69 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); | 69 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 7891a7e..c0ebd63 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -117,2 +117,11 @@ void MediaWidget::paintButton( QPainter &p, const Button &button ) | |||
117 | 117 | ||
118 | void MediaWidget::setToggleButton( Command command, bool down ) | ||
119 | { | ||
120 | for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) | ||
121 | if ( it->command == command ) { | ||
122 | setToggleButton( *it, down ); | ||
123 | return; | ||
124 | } | ||
125 | } | ||
126 | |||
118 | void MediaWidget::setToggleButton( Button &button, bool down ) | 127 | void MediaWidget::setToggleButton( Button &button, bool down ) |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 3bf01b6..caae0a7 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -94,2 +94,3 @@ protected: | |||
94 | void setToggleButton( Button &button, bool down ); | 94 | void setToggleButton( Button &button, bool down ); |
95 | void setToggleButton( Command command, bool down ); | ||
95 | void toggleButton( Button &button ); | 96 | void toggleButton( Button &button ); |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 4867ef1..06f6cd2 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -114,3 +114,3 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
114 | if ( !qRed( imgMask.pixel( x, y ) ) ) | 114 | if ( !qRed( imgMask.pixel( x, y ) ) ) |
115 | line[x] = i + 1; | 115 | line[x] = button.command + 1; |
116 | } | 116 | } |
@@ -249,2 +249,3 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
249 | Button &button = buttons[ i ]; | 249 | Button &button = buttons[ i ]; |
250 | Command command = button.command; | ||
250 | 251 | ||
@@ -252,3 +253,3 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
252 | // The test to see if the mouse click is inside the button or not | 253 | // The test to see if the mouse click is inside the button or not |
253 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); | 254 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, command ); |
254 | 255 | ||
@@ -258,9 +259,10 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
258 | 259 | ||
259 | switch (i) { | 260 | switch ( command ) { |
260 | case VideoVolUp: | 261 | case VolumeUp: |
261 | emit moreClicked(); | 262 | emit moreClicked(); |
262 | return; | 263 | return; |
263 | case VideoVolDown: | 264 | case VolumeDown: |
264 | emit lessClicked(); | 265 | emit lessClicked(); |
265 | return; | 266 | return; |
267 | default: break; | ||
266 | } | 268 | } |
@@ -278,5 +280,5 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
278 | 280 | ||
279 | switch(i) { | 281 | switch( command ) { |
280 | 282 | ||
281 | case VideoPlay: { | 283 | case Play: { |
282 | if( mediaPlayerState.isPaused() ) { | 284 | if( mediaPlayerState.isPaused() ) { |
@@ -294,8 +296,9 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
294 | 296 | ||
295 | case VideoStop: mediaPlayerState.setPlaying( FALSE ); return; | 297 | case Stop: mediaPlayerState.setPlaying( FALSE ); return; |
296 | case VideoNext: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; | 298 | case Next: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; |
297 | case VideoPrevious: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; | 299 | case Previous: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; |
298 | case VideoVolUp: emit moreReleased(); return; | 300 | case VolumeUp: emit moreReleased(); return; |
299 | case VideoVolDown: emit lessReleased(); return; | 301 | case VolumeDown: emit lessReleased(); return; |
300 | case VideoFullscreen: mediaPlayerState.setFullscreen( TRUE ); makeVisible(); return; | 302 | case FullScreen: mediaPlayerState.setFullscreen( TRUE ); makeVisible(); return; |
303 | default: break; | ||
301 | } | 304 | } |
@@ -429,3 +432,3 @@ XineVideoWidget* VideoWidget::vidWidget() { | |||
429 | void VideoWidget::setFullscreen ( bool b ) { | 432 | void VideoWidget::setFullscreen ( bool b ) { |
430 | setToggleButton( buttons[ VideoFullscreen ], b ); | 433 | setToggleButton( FullScreen, b ); |
431 | } | 434 | } |
@@ -434,3 +437,3 @@ void VideoWidget::setFullscreen ( bool b ) { | |||
434 | void VideoWidget::setPlaying( bool b) { | 437 | void VideoWidget::setPlaying( bool b) { |
435 | setToggleButton( buttons[ VideoPlay ], b ); | 438 | setToggleButton( Play, b ); |
436 | } | 439 | } |
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index 915e9cc..c3bc131 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h | |||
@@ -46,13 +46,2 @@ class QSlider; | |||
46 | 46 | ||
47 | enum VideoButtons { | ||
48 | VideoPlay = 0, | ||
49 | VideoStop, | ||
50 | // VideoPause, | ||
51 | VideoNext, | ||
52 | VideoPrevious, | ||
53 | VideoVolUp, | ||
54 | VideoVolDown, | ||
55 | VideoFullscreen | ||
56 | }; | ||
57 | |||
58 | class VideoWidget : public MediaWidget { | 47 | class VideoWidget : public MediaWidget { |