-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 | |||
@@ -431,10 +431,10 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
431 | qDebug("mouseEvent %d", i); | 431 | qDebug("mouseEvent %d", i); |
432 | switch (i) { | 432 | switch (i) { |
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 ); |
439 | return; | 439 | return; |
440 | } | 440 | } |
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 | |||
@@ -50,9 +50,6 @@ public: | |||
50 | MediaPlayerState( QObject *parent, const char *name ); | 50 | MediaPlayerState( QObject *parent, const char *name ); |
51 | ~MediaPlayerState(); | 51 | ~MediaPlayerState(); |
52 | 52 | ||
53 | bool isPaused; | ||
54 | bool isPlaying; | ||
55 | bool isStoped; | ||
56 | bool streaming(); | 53 | bool streaming(); |
57 | bool seekable(); | 54 | bool seekable(); |
58 | bool fullscreen(); | 55 | bool fullscreen(); |
@@ -130,6 +127,9 @@ private: | |||
130 | bool isLooping; | 127 | bool isLooping; |
131 | bool isShuffled; | 128 | bool isShuffled; |
132 | bool usePlaylist; | 129 | bool usePlaylist; |
130 | bool isPaused; | ||
131 | bool isPlaying; | ||
132 | bool isStoped; | ||
133 | long curPosition; | 133 | long curPosition; |
134 | long curLength; | 134 | long curLength; |
135 | char curView; | 135 | char curView; |
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 | |||
@@ -327,11 +327,11 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
327 | switch(i) { | 327 | switch(i) { |
328 | 328 | ||
329 | case VideoPlay: { | 329 | case VideoPlay: { |
330 | if( mediaPlayerState->isPaused ) { | 330 | if( mediaPlayerState->paused() ) { |
331 | setToggleButton( i, FALSE ); | 331 | setToggleButton( i, FALSE ); |
332 | mediaPlayerState->setPaused( FALSE ); | 332 | mediaPlayerState->setPaused( FALSE ); |
333 | return; | 333 | return; |
334 | } else if( !mediaPlayerState->isPaused ) { | 334 | } else if( !mediaPlayerState->paused() ) { |
335 | setToggleButton( i, TRUE ); | 335 | setToggleButton( i, TRUE ); |
336 | mediaPlayerState->setPaused( TRUE ); | 336 | mediaPlayerState->setPaused( TRUE ); |
337 | return; | 337 | return; |
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 | |||
@@ -180,7 +180,7 @@ long XineControl::position() { | |||
180 | mediaPlayerState->updatePosition( m_position ); | 180 | mediaPlayerState->updatePosition( m_position ); |
181 | long emitPos = (long)m_position; | 181 | long emitPos = (long)m_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 |
185 | QTimer::singleShot( 1000, this, SLOT( position() ) ); | 185 | QTimer::singleShot( 1000, this, SLOT( position() ) ); |
186 | } | 186 | } |