1 files changed, 37 insertions, 38 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
@@ -52,3 +52,2 @@
 
-extern MediaPlayerState *mediaPlayerState;
 extern PlayListWidget *playList;
@@ -92,5 +91,5 @@ 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 ) {
 
@@ -161,4 +160,4 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name) :
 
-    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 ) ) );
 
@@ -170,7 +169,7 @@ 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() );
 
@@ -248,4 +247,4 @@ void AudioWidget::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 );
 }
@@ -254,3 +253,3 @@ void AudioWidget::setPosition( long i ) {
     //    qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i);
-    updateSlider( i, mediaPlayerState->length() );
+    updateSlider( i, mediaPlayerState.length() );
 }
@@ -259,3 +258,3 @@ void AudioWidget::setPosition( long i ) {
 void AudioWidget::setLength( long max ) {
-    updateSlider( mediaPlayerState->position(), max );
+    updateSlider( mediaPlayerState.position(), max );
 }
@@ -282,4 +281,4 @@ void AudioWidget::setSeekable( bool isSeekable ) {
         }
-        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() ) );
@@ -291,4 +290,4 @@ void AudioWidget::setSeekable( bool isSeekable ) {
         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() ) );
@@ -356,3 +355,3 @@ void AudioWidget::skipFor() {
     startTimer( 50 );
-    mediaPlayerState->setPosition(  mediaPlayerState->position() + 2 );
+    mediaPlayerState.setPosition( mediaPlayerState.position() + 2 );
 }
@@ -362,3 +361,3 @@ void AudioWidget::skipBack() {
     startTimer( 50 );
-    mediaPlayerState->setPosition(  mediaPlayerState->position() - 2 );
+    mediaPlayerState.setPosition( mediaPlayerState.position() - 2 );
 }
@@ -374,5 +373,5 @@ 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 );
     }
@@ -422,16 +421,16 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
                 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;
@@ -462,3 +461,3 @@ void AudioWidget::showEvent( QShowEvent* ) {
 void AudioWidget::closeEvent( QCloseEvent* ) {
-    mediaPlayerState->setList();
+    mediaPlayerState.setList();
 }
@@ -496,3 +495,3 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
       case Key_F11: //menu
-              mediaPlayerState->toggleBlank();
+              mediaPlayerState.toggleBlank();
           break;
@@ -501,8 +500,8 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
       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);
@@ -510,3 +509,3 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
               //                toggleButton(0);
-              mediaPlayerState->setPlaying(TRUE);
+              mediaPlayerState.setPlaying(TRUE);
               //                toggleButton(0);
@@ -529,3 +528,3 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
           //            toggleButton(3);
-          mediaPlayerState->setNext();
+          mediaPlayerState.setNext();
           //            toggleButton(3);
@@ -534,3 +533,3 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
           //            toggleButton(4);
-          mediaPlayerState->setPrev();
+          mediaPlayerState.setPrev();
           //            toggleButton(4);