-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.h | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 6ccf206..a52319b 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -433,6 +433,6 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
433 | case AudioPlay: | 433 | case AudioPlay: |
434 | if( mediaPlayerState->isPaused ) { | 434 | if( mediaPlayerState->paused() ) { |
435 | mediaPlayerState->setPaused( FALSE ); | 435 | mediaPlayerState->setPaused( FALSE ); |
436 | return; | 436 | return; |
437 | } else if( !mediaPlayerState->isPaused ) { | 437 | } else if( !mediaPlayerState->paused() ) { |
438 | mediaPlayerState->setPaused( TRUE ); | 438 | mediaPlayerState->setPaused( TRUE ); |
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h index 8c4e09e..154e3b0 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.h +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h | |||
@@ -52,5 +52,2 @@ public: | |||
52 | 52 | ||
53 | bool isPaused; | ||
54 | bool isPlaying; | ||
55 | bool isStoped; | ||
56 | bool streaming(); | 53 | bool streaming(); |
@@ -132,2 +129,5 @@ private: | |||
132 | bool usePlaylist; | 129 | bool usePlaylist; |
130 | bool isPaused; | ||
131 | bool isPlaying; | ||
132 | bool isStoped; | ||
133 | long curPosition; | 133 | long curPosition; |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index c643273..3a757f0 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -329,3 +329,3 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
329 | case VideoPlay: { | 329 | case VideoPlay: { |
330 | if( mediaPlayerState->isPaused ) { | 330 | if( mediaPlayerState->paused() ) { |
331 | setToggleButton( i, FALSE ); | 331 | setToggleButton( i, FALSE ); |
@@ -333,3 +333,3 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
333 | return; | 333 | return; |
334 | } else if( !mediaPlayerState->isPaused ) { | 334 | } else if( !mediaPlayerState->paused() ) { |
335 | setToggleButton( i, TRUE ); | 335 | setToggleButton( i, TRUE ); |
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index c46994a..f6289d7 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp | |||
@@ -182,3 +182,3 @@ long XineControl::position() { | |||
182 | emit positionChanged( emitPos ); | 182 | emit positionChanged( emitPos ); |
183 | if( mediaPlayerState->isPlaying ) { | 183 | if( mediaPlayerState->playing() ) { |
184 | // needs to be stopped the media is stopped | 184 | // needs to be stopped the media is stopped |