author | simon <simon> | 2002-12-09 15:46:08 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-09 15:46:08 (UTC) |
commit | aa766a6a0818ed0b756f8cd67fc4a1c85906f224 (patch) (unidiff) | |
tree | fe6af32c30e0355f839a8a574d1ec7d8a7561fd5 /noncore/multimedia/opieplayer2 | |
parent | 21738c78103c42605625f85abf7bfd0d6beaad3f (diff) | |
download | opie-aa766a6a0818ed0b756f8cd67fc4a1c85906f224.zip opie-aa766a6a0818ed0b756f8cd67fc4a1c85906f224.tar.gz opie-aa766a6a0818ed0b756f8cd67fc4a1c85906f224.tar.bz2 |
- toggleButton and setToggleButton now operate on a Button object instead
of an index
Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 12 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 14 |
5 files changed, 17 insertions, 23 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 8c7e614..ef606ab 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -338,13 +338,13 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
338 | if ( event->state() == QMouseEvent::LeftButton ) { | 338 | if ( event->state() == QMouseEvent::LeftButton ) { |
339 | // The test to see if the mouse click is inside the button or not | 339 | // The test to see if the mouse click is inside the button or not |
340 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); | 340 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); |
341 | 341 | ||
342 | if ( isOnButton && !buttons[i].isHeld ) { | 342 | if ( isOnButton && !buttons[i].isHeld ) { |
343 | buttons[i].isHeld = TRUE; | 343 | buttons[i].isHeld = TRUE; |
344 | toggleButton(i); | 344 | toggleButton( buttons[ i ] ); |
345 | switch (i) { | 345 | switch (i) { |
346 | case VolumeUp: | 346 | case VolumeUp: |
347 | emit moreClicked(); | 347 | emit moreClicked(); |
348 | return; | 348 | return; |
349 | case VolumeDown: | 349 | case VolumeDown: |
350 | emit lessClicked(); | 350 | emit lessClicked(); |
@@ -355,19 +355,19 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
355 | case Back: | 355 | case Back: |
356 | emit backClicked(); | 356 | emit backClicked(); |
357 | return; | 357 | return; |
358 | } | 358 | } |
359 | } else if ( !isOnButton && buttons[i].isHeld ) { | 359 | } else if ( !isOnButton && buttons[i].isHeld ) { |
360 | buttons[i].isHeld = FALSE; | 360 | buttons[i].isHeld = FALSE; |
361 | toggleButton(i); | 361 | toggleButton( buttons[ i ] ); |
362 | } | 362 | } |
363 | } else { | 363 | } else { |
364 | if ( buttons[i].isHeld ) { | 364 | if ( buttons[i].isHeld ) { |
365 | buttons[i].isHeld = FALSE; | 365 | buttons[i].isHeld = FALSE; |
366 | if ( buttons[i].type != ToggleButton ) { | 366 | if ( buttons[i].type != ToggleButton ) { |
367 | setToggleButton( i, FALSE ); | 367 | setToggleButton( buttons[ i ], FALSE ); |
368 | } | 368 | } |
369 | qDebug("mouseEvent %d", i); | 369 | qDebug("mouseEvent %d", i); |
370 | handleCommand( static_cast<Command>( i ), buttons[ i ].isDown ); | 370 | handleCommand( static_cast<Command>( i ), buttons[ i ].isDown ); |
371 | } | 371 | } |
372 | } | 372 | } |
373 | } | 373 | } |
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 9b276b5..092e5ce 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -56,19 +56,19 @@ public: | |||
56 | ~AudioWidget(); | 56 | ~AudioWidget(); |
57 | void setTickerText( const QString &text ) { songInfo.setText( text ); } | 57 | void setTickerText( const QString &text ) { songInfo.setText( text ); } |
58 | public slots: | 58 | 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( Loop, b ); } | 62 | void setLooping( bool b) { setToggleButton( buttons[ 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( Play, b ); } | 68 | virtual void setPlaying( bool b) { setToggleButton( buttons[ Play ], b ); } |
69 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); | 69 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); |
70 | 70 | ||
71 | signals: | 71 | signals: |
72 | void moreClicked(); | 72 | void moreClicked(); |
73 | void lessClicked(); | 73 | void lessClicked(); |
74 | void forwardClicked(); | 74 | void forwardClicked(); |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 9c5291b..66129c9 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -111,26 +111,20 @@ void MediaWidget::paintButton( QPainter &p, const Button &button ) | |||
111 | if ( button.isDown ) | 111 | if ( button.isDown ) |
112 | p.drawPixmap( upperLeftOfButtonMask, button.pixDown ); | 112 | p.drawPixmap( upperLeftOfButtonMask, button.pixDown ); |
113 | else | 113 | else |
114 | p.drawPixmap( upperLeftOfButtonMask, button.pixUp ); | 114 | p.drawPixmap( upperLeftOfButtonMask, button.pixUp ); |
115 | } | 115 | } |
116 | 116 | ||
117 | void MediaWidget::setToggleButton( int buttonId, bool down ) | 117 | void MediaWidget::setToggleButton( Button &button, bool down ) |
118 | { | 118 | { |
119 | qDebug("setToggleButton %d", buttonId ); | ||
120 | |||
121 | Button &button = buttons[ buttonId ]; | ||
122 | |||
123 | if ( down != button.isDown ) | 119 | if ( down != button.isDown ) |
124 | toggleButton( buttonId ); | 120 | toggleButton( button ); |
125 | } | 121 | } |
126 | 122 | ||
127 | void MediaWidget::toggleButton( int buttonId ) | 123 | void MediaWidget::toggleButton( Button &button ) |
128 | { | 124 | { |
129 | Button &button = buttons[ buttonId ]; | ||
130 | |||
131 | button.isDown = !button.isDown; | 125 | button.isDown = !button.isDown; |
132 | 126 | ||
133 | paintButton( button ); | 127 | paintButton( button ); |
134 | } | 128 | } |
135 | 129 | ||
136 | /* vim: et sw=4 ts=4 | 130 | /* vim: et sw=4 ts=4 |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index b7860dc..05b7b71 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -88,14 +88,14 @@ protected: | |||
88 | bool isOverButton( const QPoint &position, int buttonId ) const; | 88 | bool isOverButton( const QPoint &position, int buttonId ) const; |
89 | 89 | ||
90 | void paintAllButtons( QPainter &p ); | 90 | void paintAllButtons( QPainter &p ); |
91 | void paintButton( const Button &button ); | 91 | void paintButton( const Button &button ); |
92 | void paintButton( QPainter &p, const Button &button ); | 92 | void paintButton( QPainter &p, const Button &button ); |
93 | 93 | ||
94 | void setToggleButton( int buttonId, bool down ); | 94 | void setToggleButton( Button &button, bool down ); |
95 | void toggleButton( int buttonId ); | 95 | void toggleButton( Button &button ); |
96 | 96 | ||
97 | MediaPlayerState &mediaPlayerState; | 97 | MediaPlayerState &mediaPlayerState; |
98 | PlayListWidget &playList; | 98 | PlayListWidget &playList; |
99 | 99 | ||
100 | ButtonMap buttons; | 100 | ButtonMap buttons; |
101 | 101 | ||
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index db4a396..673c9e8 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -247,43 +247,43 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
247 | if ( event->state() == QMouseEvent::LeftButton ) { | 247 | if ( event->state() == QMouseEvent::LeftButton ) { |
248 | // The test to see if the mouse click is inside the button or not | 248 | // The test to see if the mouse click is inside the button or not |
249 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); | 249 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); |
250 | 250 | ||
251 | if ( isOnButton && !buttons[i].isHeld ) { | 251 | if ( isOnButton && !buttons[i].isHeld ) { |
252 | buttons[i].isHeld = TRUE; | 252 | buttons[i].isHeld = TRUE; |
253 | toggleButton(i); | 253 | toggleButton( buttons[ i ] ); |
254 | 254 | ||
255 | switch (i) { | 255 | switch (i) { |
256 | case VideoVolUp: | 256 | case VideoVolUp: |
257 | emit moreClicked(); | 257 | emit moreClicked(); |
258 | return; | 258 | return; |
259 | case VideoVolDown: | 259 | case VideoVolDown: |
260 | emit lessClicked(); | 260 | emit lessClicked(); |
261 | return; | 261 | return; |
262 | } | 262 | } |
263 | } else if ( !isOnButton && buttons[i].isHeld ) { | 263 | } else if ( !isOnButton && buttons[i].isHeld ) { |
264 | buttons[i].isHeld = FALSE; | 264 | buttons[i].isHeld = FALSE; |
265 | toggleButton(i); | 265 | toggleButton( buttons[ i ] ); |
266 | } | 266 | } |
267 | } else { | 267 | } else { |
268 | 268 | ||
269 | if ( buttons[i].isHeld ) { | 269 | if ( buttons[i].isHeld ) { |
270 | buttons[i].isHeld = FALSE; | 270 | buttons[i].isHeld = FALSE; |
271 | if ( buttons[i].type != ToggleButton ) { | 271 | if ( buttons[i].type != ToggleButton ) { |
272 | setToggleButton( i, FALSE ); | 272 | setToggleButton( buttons[ i ], FALSE ); |
273 | } | 273 | } |
274 | 274 | ||
275 | switch(i) { | 275 | switch(i) { |
276 | 276 | ||
277 | case VideoPlay: { | 277 | case VideoPlay: { |
278 | if( mediaPlayerState.isPaused() ) { | 278 | if( mediaPlayerState.isPaused() ) { |
279 | setToggleButton( i, FALSE ); | 279 | setToggleButton( buttons[ i ], FALSE ); |
280 | mediaPlayerState.setPaused( FALSE ); | 280 | mediaPlayerState.setPaused( FALSE ); |
281 | return; | 281 | return; |
282 | } else if( !mediaPlayerState.isPaused() ) { | 282 | } else if( !mediaPlayerState.isPaused() ) { |
283 | setToggleButton( i, TRUE ); | 283 | setToggleButton( buttons[ i ], TRUE ); |
284 | mediaPlayerState.setPaused( TRUE ); | 284 | mediaPlayerState.setPaused( TRUE ); |
285 | return; | 285 | return; |
286 | } else { | 286 | } else { |
287 | return; | 287 | return; |
288 | } | 288 | } |
289 | } | 289 | } |
@@ -420,14 +420,14 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) { | |||
420 | XineVideoWidget* VideoWidget::vidWidget() { | 420 | XineVideoWidget* VideoWidget::vidWidget() { |
421 | return videoFrame; | 421 | return videoFrame; |
422 | } | 422 | } |
423 | 423 | ||
424 | 424 | ||
425 | void VideoWidget::setFullscreen ( bool b ) { | 425 | void VideoWidget::setFullscreen ( bool b ) { |
426 | setToggleButton( VideoFullscreen, b ); | 426 | setToggleButton( buttons[ VideoFullscreen ], b ); |
427 | } | 427 | } |
428 | 428 | ||
429 | 429 | ||
430 | void VideoWidget::setPlaying( bool b) { | 430 | void VideoWidget::setPlaying( bool b) { |
431 | setToggleButton( VideoPlay, b ); | 431 | setToggleButton( buttons[ VideoPlay ], b ); |
432 | } | 432 | } |
433 | 433 | ||