author | simon <simon> | 2002-12-09 20:02:52 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-09 20:02:52 (UTC) |
commit | 2d2d57e3b7988f4246319cdfd0dc7fa90110db8e (patch) (unidiff) | |
tree | fb4dfb832e2630e7da1cc57e92ba6c62ead22dee /noncore/multimedia/opieplayer2/mediaplayer.cpp | |
parent | 046f040efcb0f313818d1dbb1dc1db9021678175 (diff) | |
download | opie-2d2d57e3b7988f4246319cdfd0dc7fa90110db8e.zip opie-2d2d57e3b7988f4246319cdfd0dc7fa90110db8e.tar.gz opie-2d2d57e3b7988f4246319cdfd0dc7fa90110db8e.tar.bz2 |
- reworked the mouse event handling to be much simpler
- fixed missing return in Play case in handleCommand, which accidentially
broke pausing
- accept the key events we receive in the audioWidget
- commented out suspicious connect to pauseCheck in mediaplayer, which
broke pausing via space bar
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index ed7e37f..e1bfc2d 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -42,13 +42,14 @@ MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPla | |||
42 | qApp->processEvents(); | 42 | qApp->processEvents(); |
43 | // QPEApplication::grabKeyboard(); // EVIL | 43 | // QPEApplication::grabKeyboard(); // EVIL |
44 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 44 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
45 | 45 | ||
46 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) ); | 46 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) ); |
47 | 47 | ||
48 | connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pauseCheck( bool ) ) ); | 48 | // What is pauseCheck good for? (Simon) |
49 | // connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pauseCheck( bool ) ) ); | ||
49 | 50 | ||
50 | connect( &mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) ); | 51 | connect( &mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) ); |
51 | connect( &mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) ); | 52 | connect( &mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) ); |
52 | connect( &mediaPlayerState, SIGNAL( blankToggled( bool ) ), this, SLOT ( blank( bool ) ) ); | 53 | connect( &mediaPlayerState, SIGNAL( blankToggled( bool ) ), this, SLOT ( blank( bool ) ) ); |
53 | 54 | ||
54 | volControl = new VolumeControl; | 55 | volControl = new VolumeControl; |