summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.h6
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp2
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 ) {
case AudioPlay:
- if( mediaPlayerState->isPaused ) {
+ if( mediaPlayerState->paused() ) {
mediaPlayerState->setPaused( FALSE );
return;
- } else if( !mediaPlayerState->isPaused ) {
+ } else if( !mediaPlayerState->paused() ) {
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:
- bool isPaused;
- bool isPlaying;
- bool isStoped;
bool streaming();
@@ -132,2 +129,5 @@ private:
bool usePlaylist;
+ bool isPaused;
+ bool isPlaying;
+ bool isStoped;
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 ) {
case VideoPlay: {
- if( mediaPlayerState->isPaused ) {
+ if( mediaPlayerState->paused() ) {
setToggleButton( i, FALSE );
@@ -333,3 +333,3 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
return;
- } else if( !mediaPlayerState->isPaused ) {
+ } else if( !mediaPlayerState->paused() ) {
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() {
emit positionChanged( emitPos );
- if( mediaPlayerState->isPlaying ) {
+ if( mediaPlayerState->playing() ) {
// needs to be stopped the media is stopped