- the audiowidget and the videowidget don't rely on the mediaplayerstate

  singleton anymore

7 files changed, 87 insertions, 86 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index f4edb79..d9beb90 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -51,5 +51,4 @@
 #include "playlistwidget.h"
 
-extern MediaPlayerState *mediaPlayerState;
 extern PlayListWidget *playList;
 
@@ -91,7 +90,7 @@ static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton));
 
 
-AudioWidget::AudioWidget(QWidget* parent, const char* name) :
+AudioWidget::AudioWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) :
 
-    MediaWidget( parent, name ), songInfo( this ), slider( Qt::Horizontal, this ),  time( this ) {
+    MediaWidget( mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ),  time( this ) {
 
     setCaption( tr("OpiePlayer") );
@@ -160,6 +159,6 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name) :
     resizeEvent( NULL );
 
-    connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
-    connect( mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) );
+    connect( &mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
+    connect( &mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) );
 
     connect( this,  SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) );
@@ -169,9 +168,9 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name) :
 
     // Intialise state
-    setLength( mediaPlayerState->length() );
-    setPosition( mediaPlayerState->position() );
-    setLooping( mediaPlayerState->isFullscreen() );
+    setLength( mediaPlayerState.length() );
+    setPosition( mediaPlayerState.position() );
+    setLooping( mediaPlayerState.isFullscreen() );
     //    setPaused( mediaPlayerState->paused() );
-    setPlaying( mediaPlayerState->isPlaying() );
+    setPlaying( mediaPlayerState.isPlaying() );
 
 }
@@ -247,16 +246,16 @@ void AudioWidget::sliderReleased() {
     if ( slider.width() == 0 )
   return;
-    long val = long((double)slider.value() * mediaPlayerState->length() / slider.width());
-    mediaPlayerState->setPosition( val );
+    long val = long((double)slider.value() * mediaPlayerState.length() / slider.width());
+    mediaPlayerState.setPosition( val );
 }
 
 void AudioWidget::setPosition( long i ) {
     //    qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i);
-    updateSlider( i, mediaPlayerState->length() );
+    updateSlider( i, mediaPlayerState.length() );
 }
 
 
 void AudioWidget::setLength( long max ) {
-    updateSlider( mediaPlayerState->position(), max );
+    updateSlider( mediaPlayerState.position(), max );
 }
 
@@ -281,6 +280,6 @@ void AudioWidget::setSeekable( bool isSeekable ) {
             slider.hide();
         }
-        disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
-        disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
+        disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
+        disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
         disconnect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
         disconnect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
@@ -290,6 +289,6 @@ void AudioWidget::setSeekable( bool isSeekable ) {
         slider.show();
         qDebug( " CONNECT SET POSTION " );
-        connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
-        connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
+        connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
+        connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
         connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
         connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
@@ -355,5 +354,5 @@ void AudioWidget::skipFor() {
     skipDirection = +1;
     startTimer( 50 );
-    mediaPlayerState->setPosition(  mediaPlayerState->position() + 2 );
+    mediaPlayerState.setPosition( mediaPlayerState.position() + 2 );
 }
 
@@ -361,5 +360,5 @@ void AudioWidget::skipBack() {
     skipDirection = -1;
     startTimer( 50 );
-    mediaPlayerState->setPosition(  mediaPlayerState->position() - 2 );
+    mediaPlayerState.setPosition( mediaPlayerState.position() - 2 );
 }
 
@@ -373,7 +372,7 @@ void AudioWidget::stopSkip() {
 void AudioWidget::timerEvent( QTimerEvent * ) {
     if ( skipDirection == +1 ) {
-        mediaPlayerState->setPosition(  mediaPlayerState->position() + 2 );
+        mediaPlayerState.setPosition( mediaPlayerState.position() + 2 );
     }  else if ( skipDirection == -1 ) {
-        mediaPlayerState->setPosition(  mediaPlayerState->position() - 2 );
+        mediaPlayerState.setPosition( mediaPlayerState.position() - 2 );
     }
 }
@@ -421,18 +420,18 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
                 switch (i) {
                 case AudioPlay:
-                    if( mediaPlayerState->isPaused() ) {
-                        mediaPlayerState->setPaused( FALSE );
+                    if( mediaPlayerState.isPaused() ) {
+                        mediaPlayerState.setPaused( FALSE );
                         return;
-                    } else if( !mediaPlayerState->isPaused() ) {
-                        mediaPlayerState->setPaused( TRUE );
+                    } else if( !mediaPlayerState.isPaused() ) {
+                        mediaPlayerState.setPaused( TRUE );
                         return;
                     }
-                case AudioStop:       mediaPlayerState->setPlaying(FALSE); return;
-                case AudioNext:       if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState->setNext(); return;
-                case AudioPrevious:   if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState->setPrev(); return;
-                case AudioLoop:       mediaPlayerState->setLooping(audioButtons[i].isDown); return;
+                case AudioStop:       mediaPlayerState.setPlaying(FALSE); return;
+                case AudioNext:       if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return;
+                case AudioPrevious:   if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return;
+                case AudioLoop:       mediaPlayerState.setLooping(audioButtons[i].isDown); return;
                 case AudioVolumeUp:   emit moreReleased(); return;
                 case AudioVolumeDown: emit lessReleased(); return;
-                case AudioPlayList:   mediaPlayerState->setList();  return;
+                case AudioPlayList:   mediaPlayerState.setList();  return;
                 case AudioForward:    emit forwardReleased(); return;
                 case AudioBack:       emit backReleased(); return;
@@ -461,5 +460,5 @@ void AudioWidget::showEvent( QShowEvent* ) {
 
 void AudioWidget::closeEvent( QCloseEvent* ) {
-    mediaPlayerState->setList();
+    mediaPlayerState.setList();
 }
 
@@ -495,19 +494,19 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
           break;
       case Key_F11: //menu
-              mediaPlayerState->toggleBlank();
+              mediaPlayerState.toggleBlank();
           break;
       case Key_F12: //home
           break;
       case Key_F13: //mail
-             mediaPlayerState->toggleBlank();
+             mediaPlayerState.toggleBlank();
           break;
       case Key_Space: {
-          if(mediaPlayerState->isPlaying()) {
+          if(mediaPlayerState.isPlaying()) {
               //                toggleButton(1);
-              mediaPlayerState->setPlaying(FALSE);
+              mediaPlayerState.setPlaying(FALSE);
               //                toggleButton(1);
           } else {
               //                toggleButton(0);
-              mediaPlayerState->setPlaying(TRUE);
+              mediaPlayerState.setPlaying(TRUE);
               //                toggleButton(0);
           }
@@ -528,10 +527,10 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
       case Key_Right:
           //            toggleButton(3);
-          mediaPlayerState->setNext();
+          mediaPlayerState.setNext();
           //            toggleButton(3);
           break;
       case Key_Left:
           //            toggleButton(4);
-          mediaPlayerState->setPrev();
+          mediaPlayerState.setPrev();
           //            toggleButton(4);
           break;
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 83927f1..087d711 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -69,5 +69,5 @@ class AudioWidget : public MediaWidget {
     Q_OBJECT
 public:
-    AudioWidget( QWidget* parent=0, const char* name=0 );
+    AudioWidget( MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
     ~AudioWidget();
     void setTickerText( const QString &text ) { songInfo.setText( text ); }
diff --git a/noncore/multimedia/opieplayer2/main.cpp b/noncore/multimedia/opieplayer2/main.cpp
index 02fdbf3..fd47ea5 100644
--- a/noncore/multimedia/opieplayer2/main.cpp
+++ b/noncore/multimedia/opieplayer2/main.cpp
@@ -20,7 +20,7 @@ int main(int argc, char **argv) {
     playList = &pl;
     pl.showMaximized();
-    AudioWidget aw( 0, "audioUI" );
+    AudioWidget aw( st, 0, "audioUI" );
     audioUI = &aw;
-    VideoWidget vw( 0, "videoUI" );
+    VideoWidget vw( st, 0, "videoUI" );
     videoUI = &vw;
     a.processEvents();
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 83456a0..d58e87e 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -23,12 +23,12 @@
 extern MediaPlayerState *mediaPlayerState;
 
-MediaWidget::MediaWidget( QWidget *parent, const char *name )
-    : QWidget( parent, name )
+MediaWidget::MediaWidget( MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name )
+    : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState )
 {
-    connect( mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ),
+    connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ),
              this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) );
-    connect( mediaPlayerState, SIGNAL( lengthChanged( long ) ),
+    connect( &mediaPlayerState, SIGNAL( lengthChanged( long ) ),
              this, SLOT( setLength( long ) ) );
-    connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ),
+    connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ),
              this, SLOT( setPlaying( bool ) ) );
 }
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index fc5198e..64adba9 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -29,5 +29,5 @@ class MediaWidget : public QWidget
     Q_OBJECT
 public:
-    MediaWidget( QWidget *parent = 0, const char *name = 0 );
+    MediaWidget( MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 );
     virtual ~MediaWidget();
 
@@ -36,4 +36,7 @@ public slots:
     virtual void setLength( long length ) = 0;
     virtual void setPlaying( bool playing ) = 0;
+
+protected:
+    MediaPlayerState &mediaPlayerState;
 };
 
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index e0ca243..b4ecb4c 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -54,5 +54,4 @@
 
 
-extern MediaPlayerState *mediaPlayerState;
 extern PlayListWidget *playList;
 
@@ -83,6 +82,6 @@ static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton));
 
 
-VideoWidget::VideoWidget(QWidget* parent, const char* name) :
-MediaWidget( parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) {
+VideoWidget::VideoWidget(MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) :
+MediaWidget( mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) {
 
 
@@ -138,8 +137,8 @@ MediaWidget( parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) {
     resizeEvent( NULL );
 
-    setLength( mediaPlayerState->length() );
-    setPosition( mediaPlayerState->position() );
-    setFullscreen( mediaPlayerState->isFullscreen() );
-    setPlaying( mediaPlayerState->isPlaying() );
+    setLength( mediaPlayerState.length() );
+    setPosition( mediaPlayerState.position() );
+    setFullscreen( mediaPlayerState.isFullscreen() );
+    setPlaying( mediaPlayerState.isPlaying() );
 }
 
@@ -222,15 +221,15 @@ void VideoWidget::sliderReleased() {
         return;
     }
-    long val = long((double)slider->value() * mediaPlayerState->length() / slider->width());
-    mediaPlayerState->setPosition( val );
+    long val = long((double)slider->value() * mediaPlayerState.length() / slider->width());
+    mediaPlayerState.setPosition( val );
 }
 
 void VideoWidget::setPosition( long i ) {
-    updateSlider( i, mediaPlayerState->length() );
+    updateSlider( i, mediaPlayerState.length() );
 }
 
 
 void VideoWidget::setLength( long max ) {
-    updateSlider( mediaPlayerState->position(), max );
+    updateSlider( mediaPlayerState.position(), max );
 }
 
@@ -255,5 +254,5 @@ void VideoWidget::updateSlider( long i, long max ) {
     int width = slider->width();
     int val = int((double)i * width / max);
-    if ( !mediaPlayerState->isFullscreen() && !videoSliderBeingMoved ) {
+    if ( !mediaPlayerState.isFullscreen() && !videoSliderBeingMoved ) {
         if ( slider->value() != val ) {
             slider->setValue( val );
@@ -324,11 +323,11 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
 
                 case VideoPlay: {
-                    if( mediaPlayerState->isPaused() ) {
+                    if( mediaPlayerState.isPaused() ) {
                         setToggleButton( i, FALSE );
-                        mediaPlayerState->setPaused( FALSE );
+                        mediaPlayerState.setPaused( FALSE );
                         return;
-                    } else if( !mediaPlayerState->isPaused() ) {
+                    } else if( !mediaPlayerState.isPaused() ) {
                         setToggleButton( i, TRUE );
-                        mediaPlayerState->setPaused( TRUE );
+                        mediaPlayerState.setPaused( TRUE );
                         return;
                     } else {
@@ -337,10 +336,10 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
                 }
 
-                case VideoStop:       mediaPlayerState->setPlaying( FALSE ); return;
-                case VideoNext:       if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState->setNext(); return;
-                case VideoPrevious:   if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState->setPrev(); return;
+                case VideoStop:       mediaPlayerState.setPlaying( FALSE ); return;
+                case VideoNext:       if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return;
+                case VideoPrevious:   if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return;
                 case VideoVolUp:      emit moreReleased(); return;
                 case VideoVolDown:    emit lessReleased(); return;
-                case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
+                case VideoFullscreen: mediaPlayerState.setFullscreen( TRUE ); makeVisible(); return;
                 }
             }
@@ -354,6 +353,6 @@ void VideoWidget::mousePressEvent( QMouseEvent *event ) {
 
 void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
-    if ( mediaPlayerState->isFullscreen() ) {
-        mediaPlayerState->setFullscreen( FALSE );
+    if ( mediaPlayerState.isFullscreen() ) {
+        mediaPlayerState.setFullscreen( FALSE );
         makeVisible();
     }
@@ -368,10 +367,10 @@ void VideoWidget::showEvent( QShowEvent* ) {
 
  void VideoWidget::backToNormal() {
-     mediaPlayerState->setFullscreen( FALSE );
+     mediaPlayerState.setFullscreen( FALSE );
      makeVisible();
  }
 
 void VideoWidget::makeVisible() {
-    if ( mediaPlayerState->isFullscreen() ) {
+    if ( mediaPlayerState.isFullscreen() ) {
         setBackgroundMode( QWidget::NoBackground );
         showFullScreen();
@@ -380,6 +379,6 @@ void VideoWidget::makeVisible() {
 
         slider->hide();
-        disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
-        disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
+        disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
+        disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
         disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
         disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
@@ -400,16 +399,16 @@ void VideoWidget::makeVisible() {
         }
 
-        if ( !mediaPlayerState->isSeekable()  ) {
+        if ( !mediaPlayerState.isSeekable()  ) {
             if( !slider->isHidden()) {
                 slider->hide();
             }
-            disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
-            disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
+            disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
+            disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
             disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
             disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
         } else {
             slider->show();
-            connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
-            connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
+            connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
+            connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
             connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
             connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
@@ -424,5 +423,5 @@ void VideoWidget::paintEvent( QPaintEvent * pe) {
     QPainter p( this );
 
-    if ( mediaPlayerState->isFullscreen() ) {
+    if ( mediaPlayerState.isFullscreen() ) {
         // Clear the background
         p.setBrush( QBrush( Qt::black ) );
@@ -450,5 +449,5 @@ void VideoWidget::paintEvent( QPaintEvent * pe) {
 
 void VideoWidget::closeEvent( QCloseEvent* ) {
-    mediaPlayerState->setList();
+    mediaPlayerState.setList();
 }
 
@@ -471,8 +470,8 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
           break;
       case Key_Space: {
-          if(mediaPlayerState->isPlaying()) {
-              mediaPlayerState->setPlaying(FALSE);
+          if(mediaPlayerState.isPlaying()) {
+              mediaPlayerState.setPlaying(FALSE);
           } else {
-              mediaPlayerState->setPlaying(TRUE);
+              mediaPlayerState.setPlaying(TRUE);
           }
       }
@@ -491,8 +490,8 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
            break;
       case Key_Right:
-          mediaPlayerState->setNext();
+          mediaPlayerState.setNext();
           break;
       case Key_Left:
-          mediaPlayerState->setPrev();
+          mediaPlayerState.setPrev();
           break;
       case Key_Escape:
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 816ce2e..38eb726 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -57,5 +57,5 @@ class VideoWidget : public MediaWidget {
     Q_OBJECT
 public:
-    VideoWidget( QWidget* parent=0, const char* name=0 );
+    VideoWidget( MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
     ~VideoWidget();