Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -59,13 +59,13 @@ public slots: | |||
59 | void updateSlider( long, long ); | 59 | void updateSlider( long, long ); |
60 | void sliderPressed( ); | 60 | void sliderPressed( ); |
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 ); |
64 | void setSeekable( bool ); | 64 | void setSeekable( bool ); |
65 | 65 | ||
66 | public: | 66 | 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 ); |
70 | 70 | ||
71 | signals: | 71 | signals: |
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 | |||
@@ -115,6 +115,15 @@ void MediaWidget::paintButton( QPainter &p, const Button &button ) | |||
115 | p.drawPixmap( upperLeftOfButtonMask, button.pixUp ); | 115 | p.drawPixmap( upperLeftOfButtonMask, button.pixUp ); |
116 | } | 116 | } |
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 ) |
119 | { | 128 | { |
120 | if ( down != button.isDown ) | 129 | if ( down != button.isDown ) |
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 | |||
@@ -92,6 +92,7 @@ protected: | |||
92 | void paintButton( QPainter &p, const Button &button ); | 92 | void paintButton( QPainter &p, const Button &button ); |
93 | 93 | ||
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 ); |
96 | 97 | ||
97 | MediaPlayerState &mediaPlayerState; | 98 | MediaPlayerState &mediaPlayerState; |
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 | |||
@@ -112,7 +112,7 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
112 | uchar *line = dest[y]; | 112 | uchar *line = dest[y]; |
113 | for ( int x = 0; x < imgUp.width(); x++ ) | 113 | for ( int x = 0; x < imgUp.width(); x++ ) |
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 | } |
117 | } | 117 | } |
118 | 118 | ||
@@ -247,22 +247,24 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
247 | for ( unsigned int i = 0; i < buttons.size(); i++ ) { | 247 | for ( unsigned int i = 0; i < buttons.size(); i++ ) { |
248 | 248 | ||
249 | Button &button = buttons[ i ]; | 249 | Button &button = buttons[ i ]; |
250 | Command command = button.command; | ||
250 | 251 | ||
251 | if ( event->state() == QMouseEvent::LeftButton ) { | 252 | if ( event->state() == QMouseEvent::LeftButton ) { |
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 | ||
255 | if ( isOnButton && !button.isHeld ) { | 256 | if ( isOnButton && !button.isHeld ) { |
256 | button.isHeld = TRUE; | 257 | button.isHeld = TRUE; |
257 | toggleButton( button ); | 258 | toggleButton( button ); |
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 | } |
267 | } else if ( !isOnButton && button.isHeld ) { | 269 | } else if ( !isOnButton && button.isHeld ) { |
268 | button.isHeld = FALSE; | 270 | button.isHeld = FALSE; |
@@ -276,9 +278,9 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
276 | setToggleButton( button, FALSE ); | 278 | setToggleButton( button, FALSE ); |
277 | } | 279 | } |
278 | 280 | ||
279 | switch(i) { | 281 | switch( command ) { |
280 | 282 | ||
281 | case VideoPlay: { | 283 | case Play: { |
282 | if( mediaPlayerState.isPaused() ) { | 284 | if( mediaPlayerState.isPaused() ) { |
283 | setToggleButton( button, FALSE ); | 285 | setToggleButton( button, FALSE ); |
284 | mediaPlayerState.setPaused( FALSE ); | 286 | mediaPlayerState.setPaused( FALSE ); |
@@ -292,12 +294,13 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
292 | } | 294 | } |
293 | } | 295 | } |
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 | } |
302 | } | 305 | } |
303 | } | 306 | } |
@@ -427,11 +430,11 @@ XineVideoWidget* VideoWidget::vidWidget() { | |||
427 | 430 | ||
428 | 431 | ||
429 | void VideoWidget::setFullscreen ( bool b ) { | 432 | void VideoWidget::setFullscreen ( bool b ) { |
430 | setToggleButton( buttons[ VideoFullscreen ], b ); | 433 | setToggleButton( FullScreen, b ); |
431 | } | 434 | } |
432 | 435 | ||
433 | 436 | ||
434 | void VideoWidget::setPlaying( bool b) { | 437 | void VideoWidget::setPlaying( bool b) { |
435 | setToggleButton( buttons[ VideoPlay ], b ); | 438 | setToggleButton( Play, b ); |
436 | } | 439 | } |
437 | 440 | ||
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 | |||
@@ -44,17 +44,6 @@ | |||
44 | class QPixmap; | 44 | class QPixmap; |
45 | class QSlider; | 45 | 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 { |
59 | Q_OBJECT | 48 | Q_OBJECT |
60 | public: | 49 | public: |