Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 446fa45..7c49733 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -38,26 +38,28 @@ | |||
38 | #include <qwidget.h> | 38 | #include <qwidget.h> |
39 | #include <qpixmap.h> | 39 | #include <qpixmap.h> |
40 | #include <qbutton.h> | 40 | #include <qbutton.h> |
41 | #include <qpainter.h> | 41 | #include <qpainter.h> |
42 | #include <qframe.h> | 42 | #include <qframe.h> |
43 | #include <qlayout.h> | 43 | #include <qlayout.h> |
44 | 44 | ||
45 | #include <stdlib.h> | 45 | #include <stdlib.h> |
46 | #include <stdio.h> | 46 | #include <stdio.h> |
47 | 47 | ||
48 | #include "audiowidget.h" | 48 | #include "audiowidget.h" |
49 | #include "mediaplayerstate.h" | 49 | #include "mediaplayerstate.h" |
50 | #include "playlistwidget.h" | ||
50 | 51 | ||
51 | extern MediaPlayerState *mediaPlayerState; | 52 | extern MediaPlayerState *mediaPlayerState; |
53 | extern PlayListWidget *playList; | ||
52 | 54 | ||
53 | static const int xo = -2; // movable x offset | 55 | static const int xo = -2; // movable x offset |
54 | static const int yo = 22; // movable y offset | 56 | static const int yo = 22; // movable y offset |
55 | 57 | ||
56 | 58 | ||
57 | Ticker::Ticker( QWidget* parent=0 ) : QFrame( parent ) { | 59 | Ticker::Ticker( QWidget* parent=0 ) : QFrame( parent ) { |
58 | setFrameStyle( WinPanel | Sunken ); | 60 | setFrameStyle( WinPanel | Sunken ); |
59 | setText( "No Song" ); | 61 | setText( "No Song" ); |
60 | } | 62 | } |
61 | 63 | ||
62 | Ticker::~Ticker() { | 64 | Ticker::~Ticker() { |
63 | } | 65 | } |
@@ -216,24 +218,25 @@ AudioWidget::~AudioWidget() { | |||
216 | 218 | ||
217 | for ( int i = 0; i < 10; i++ ) { | 219 | for ( int i = 0; i < 10; i++ ) { |
218 | delete buttonPixUp[i]; | 220 | delete buttonPixUp[i]; |
219 | delete buttonPixDown[i]; | 221 | delete buttonPixDown[i]; |
220 | } | 222 | } |
221 | delete pixBg; | 223 | delete pixBg; |
222 | delete imgUp; | 224 | delete imgUp; |
223 | delete imgDn; | 225 | delete imgDn; |
224 | delete imgButtonMask; | 226 | delete imgButtonMask; |
225 | for ( int i = 0; i < 10; i++ ) { | 227 | for ( int i = 0; i < 10; i++ ) { |
226 | delete masks[i]; | 228 | delete masks[i]; |
227 | } | 229 | } |
230 | // mediaPlayerState->setPlaying(false); | ||
228 | } | 231 | } |
229 | 232 | ||
230 | namespace { | 233 | namespace { |
231 | 234 | ||
232 | QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { | 235 | QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { |
233 | QPixmap pix( img.width(), img.height() ); | 236 | QPixmap pix( img.width(), img.height() ); |
234 | QPainter p( &pix ); | 237 | QPainter p( &pix ); |
235 | p.drawTiledPixmap( pix.rect(), bg, offset ); | 238 | p.drawTiledPixmap( pix.rect(), bg, offset ); |
236 | p.drawImage( 0, 0, img ); | 239 | p.drawImage( 0, 0, img ); |
237 | return new QPixmap( pix ); | 240 | return new QPixmap( pix ); |
238 | } | 241 | } |
239 | 242 | ||
@@ -460,26 +463,26 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
460 | // setToggleButton( i, FALSE ); | 463 | // setToggleButton( i, FALSE ); |
461 | mediaPlayerState->setPaused( FALSE ); | 464 | mediaPlayerState->setPaused( FALSE ); |
462 | return; | 465 | return; |
463 | } else if( !mediaPlayerState->isPaused ) { | 466 | } else if( !mediaPlayerState->isPaused ) { |
464 | // setToggleButton( i, TRUE ); | 467 | // setToggleButton( i, TRUE ); |
465 | mediaPlayerState->setPaused( TRUE ); | 468 | mediaPlayerState->setPaused( TRUE ); |
466 | return; | 469 | return; |
467 | } else { | 470 | } else { |
468 | // setToggleButton( i, TRUE ); | 471 | // setToggleButton( i, TRUE ); |
469 | // mediaPlayerState->setPlaying( videoButtons[i].isDown ); | 472 | // mediaPlayerState->setPlaying( videoButtons[i].isDown ); |
470 | } | 473 | } |
471 | case AudioStop: mediaPlayerState->setPlaying(FALSE); return; | 474 | case AudioStop: mediaPlayerState->setPlaying(FALSE); return; |
472 | case AudioNext: mediaPlayerState->setNext(); return; | 475 | case AudioNext: if(playList->whichList() ==0) mediaPlayerState->setNext(); return; |
473 | case AudioPrevious: mediaPlayerState->setPrev(); return; | 476 | case AudioPrevious: if(playList->whichList() ==0) mediaPlayerState->setPrev(); return; |
474 | case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return; | 477 | case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return; |
475 | case AudioVolumeUp: emit moreReleased(); return; | 478 | case AudioVolumeUp: emit moreReleased(); return; |
476 | case AudioVolumeDown: emit lessReleased(); return; | 479 | case AudioVolumeDown: emit lessReleased(); return; |
477 | case AudioPlayList: mediaPlayerState->setList(); return; | 480 | case AudioPlayList: mediaPlayerState->setList(); return; |
478 | case AudioForward: emit forwardReleased(); return; | 481 | case AudioForward: emit forwardReleased(); return; |
479 | case AudioBack: emit backReleased(); return; | 482 | case AudioBack: emit backReleased(); return; |
480 | } | 483 | } |
481 | } | 484 | } |
482 | } | 485 | } |
483 | } | 486 | } |
484 | } | 487 | } |
485 | 488 | ||