Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 87184ba..be59d8d 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -17,2 +17,3 @@ | |||
17 | 17 | ||
18 | |||
18 | extern AudioWidget *audioUI; | 19 | extern AudioWidget *audioUI; |
@@ -26,2 +27,3 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name ) | |||
26 | 27 | ||
28 | xineControl = new XineControl(); | ||
27 | // QPEApplication::grabKeyboard(); // EVIL | 29 | // QPEApplication::grabKeyboard(); // EVIL |
@@ -31,9 +33,10 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name ) | |||
31 | connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pauseCheck( bool ) ) ); | 33 | connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pauseCheck( bool ) ) ); |
32 | connect( mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) ); | 34 | connect( mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) ); |
33 | connect( mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) ); | 35 | connect( mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) ); |
36 | |||
37 | connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); | ||
38 | connect( audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); | ||
39 | connect( audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); | ||
40 | connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); | ||
34 | 41 | ||
35 | connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); | ||
36 | connect( audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); | ||
37 | connect( audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); | ||
38 | connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); | ||
39 | } | 42 | } |
@@ -45,4 +48,5 @@ void MediaPlayer::pauseCheck( bool b ) { | |||
45 | // Only pause if playing | 48 | // Only pause if playing |
46 | if ( b && !mediaPlayerState->playing() ) | 49 | if ( b && !mediaPlayerState->playing() ) { |
47 | mediaPlayerState->setPaused( FALSE ); | 50 | mediaPlayerState->setPaused( FALSE ); |
51 | } | ||
48 | } | 52 | } |
@@ -70,4 +74,5 @@ void MediaPlayer::setPlaying( bool play ) { | |||
70 | 74 | ||
71 | audioUI->setTickerText( currentFile->file() ); | 75 | audioUI->setTickerText( currentFile->file( ) ); |
72 | 76 | ||
77 | xineControl->play( currentFile->file() ); | ||
73 | 78 | ||