- 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
@@ -426,20 +426,20 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
             if ( audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = FALSE;
                 if ( !audioButtons[i].isToggle ) {
                     setToggleButton( i, FALSE );
                 }
                 qDebug("mouseEvent %d", i);
                 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;
                     }
                 case AudioStop:       mediaPlayerState->setPlaying(FALSE); return;
                 case AudioNext:       if( playList->whichList() ==0 ) mediaPlayerState->setNext(); return;
                 case AudioPrevious:   if( playList->whichList() ==0 ) mediaPlayerState->setPrev(); return;
                 case AudioLoop:       mediaPlayerState->setLooping(audioButtons[i].isDown); return;
                 case AudioVolumeUp:   emit moreReleased(); 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
@@ -45,19 +45,16 @@ class Config;
 
 
 class MediaPlayerState : public QObject {
 Q_OBJECT
 public:
     MediaPlayerState( QObject *parent, const char *name );
     ~MediaPlayerState();
 
-    bool isPaused;
-    bool isPlaying;
-    bool isStoped;
     bool streaming();
     bool seekable();
     bool fullscreen();
     bool scaled();
     bool looping();
     bool shuffled();
     bool playlist();
     bool paused();
@@ -125,16 +122,19 @@ private:
     bool isStreaming;
     bool isSeekable;
     bool isFullscreen;
     bool isScaled;
     bool isBlanked;
     bool isLooping;
     bool isShuffled;
     bool usePlaylist;
+    bool isPaused;
+    bool isPlaying;
+    bool isStoped;
     long curPosition;
     long curLength;
     char curView;
     int videoGamma;
     void readConfig( Config& cfg );
 
 };
 
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
@@ -322,21 +322,21 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
                 videoButtons[i].isHeld = FALSE;
                 if ( !videoButtons[i].isToggle ) {
                     setToggleButton( i, FALSE );
                 }
 
                 switch(i) {
 
                 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 );
                         return;
                     } else {
                         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
@@ -175,17 +175,17 @@ void  XineControl::length() {
  * Reports the position the xine backend is at right now
  * @return long the postion in seconds
  */
 long XineControl::position() {
     m_position = ( currentTime() );
     mediaPlayerState->updatePosition( m_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() ) );
     }
     // qDebug("POSITION : %d", m_position);
     return m_position;
 }
 
 /**