- made isPaused, isPlaying and isStopped private member variables

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
@@ -432,8 +432,8 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
                 switch (i) {
                 case AudioPlay:
-                    if( mediaPlayerState->isPaused ) {
+                    if( mediaPlayerState->paused() ) {
                         mediaPlayerState->setPaused( FALSE );
                         return;
-                    } else if( !mediaPlayerState->isPaused ) {
+                    } else if( !mediaPlayerState->paused() ) {
                         mediaPlayerState->setPaused( TRUE );
                         return;
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
@@ -51,7 +51,4 @@ public:
     ~MediaPlayerState();
 
-    bool isPaused;
-    bool isPlaying;
-    bool isStoped;
     bool streaming();
     bool seekable();
@@ -131,4 +128,7 @@ private:
     bool isShuffled;
     bool usePlaylist;
+    bool isPaused;
+    bool isPlaying;
+    bool isStoped;
     long curPosition;
     long curLength;
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
@@ -328,9 +328,9 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
 
                 case VideoPlay: {
-                    if( mediaPlayerState->isPaused ) {
+                    if( mediaPlayerState->paused() ) {
                         setToggleButton( i, FALSE );
                         mediaPlayerState->setPaused( FALSE );
                         return;
-                    } else if( !mediaPlayerState->isPaused ) {
+                    } else if( !mediaPlayerState->paused() ) {
                         setToggleButton( i, TRUE );
                         mediaPlayerState->setPaused( 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
@@ -181,5 +181,5 @@ long XineControl::position() {
     long emitPos = (long)m_position;
     emit positionChanged( emitPos );
-    if( mediaPlayerState->isPlaying ) {
+    if( mediaPlayerState->playing() ) {
     // needs to be stopped the media is stopped
         QTimer::singleShot( 1000, this, SLOT( position() ) );