- MediaPlayer no more uses the MediaPlayerState instance as singleton

3 files changed, 31 insertions, 30 deletions

diff --git a/noncore/multimedia/opieplayer2/main.cpp b/noncore/multimedia/opieplayer2/main.cpp
index e951554..24aba6c 100644
--- a/noncore/multimedia/opieplayer2/main.cpp
+++ b/noncore/multimedia/opieplayer2/main.cpp
@@ -15,20 +15,20 @@ int main(int argc, char **argv) {
     QPEApplication a(argc,argv);
 
     MediaPlayerState st( 0, "mediaPlayerState" );
     mediaPlayerState = &st;
     PlayListWidget pl( 0, "playList" );
     playList = &pl;
     pl.showMaximized();
     AudioWidget aw( 0, "audioUI" );
     audioUI = &aw;
     VideoWidget vw( 0, "videoUI" );
     videoUI = &vw;
     a.processEvents();
-    MediaPlayer mp( 0, "mediaPlayer" );
+    MediaPlayer mp( st, 0, "mediaPlayer" );
 
     a.showMainDocumentWidget(&pl);
 
     return a.exec();
 }
 
 
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 68bbae9..424259b 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -18,46 +18,45 @@
 
 #include "mediaplayerstate.h"
 
 // for setBacklight()
 #include <linux/fb.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
 
 extern AudioWidget *audioUI;
 extern VideoWidget *videoUI;
 extern PlayListWidget *playList;
-extern MediaPlayerState *mediaPlayerState;
 
 
 #define FBIOBLANK             0x4611
 
-MediaPlayer::MediaPlayer( QObject *parent, const char *name )
-    : QObject( parent, name ), volumeDirection( 0 ) {
+MediaPlayer::MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name )
+    : QObject( parent, name ), volumeDirection( 0 ), mediaPlayerState( _mediaPlayerState ) {
 
     fd=-1;fl=-1;
     playList->setCaption( tr( "OpiePlayer: Initializating" ) );
 
     qApp->processEvents();
     //    QPEApplication::grabKeyboard(); // EVIL
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
-    connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) );
+    connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) );
 
-    connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ),  this, SLOT( pauseCheck( bool ) ) );
+    connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ),  this, SLOT( pauseCheck( bool ) ) );
 
-    connect( mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) );
-    connect( mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) );
-    connect( mediaPlayerState, SIGNAL( blankToggled( bool ) ), this, SLOT ( blank( bool ) ) );
+    connect( &mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) );
+    connect( &mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) );
+    connect( &mediaPlayerState, SIGNAL( blankToggled( bool ) ), this, SLOT ( blank( bool ) ) );
 
     connect( audioUI,  SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
     connect( audioUI,  SIGNAL( lessClicked() ),  this, SLOT( startDecreasingVolume() ) );
     connect( audioUI,  SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
     connect( audioUI,  SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
 
     connect( videoUI,  SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
     connect( videoUI,  SIGNAL( lessClicked() ),  this, SLOT( startDecreasingVolume() ) );
     connect( videoUI,  SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
     connect( videoUI,  SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
 
     volControl = new VolumeControl;
@@ -65,116 +64,116 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
     Config cfg( "OpiePlayer" );
     cfg.setGroup("PlayList");
     QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default");
     playList->setCaption( tr( "OpiePlayer: " ) + QFileInfo(currentPlaylist).baseName() );
 }
 
 MediaPlayer::~MediaPlayer() {
     delete xineControl;
     delete volControl;
 }
 
 void MediaPlayer::pauseCheck( bool b ) {
-     if ( b && !mediaPlayerState->isPlaying() ) {
-         mediaPlayerState->setPaused( FALSE );
+     if ( b && !mediaPlayerState.isPlaying() ) {
+         mediaPlayerState.setPaused( FALSE );
      }
 }
 
 void MediaPlayer::play() {
-    mediaPlayerState->setPlaying( FALSE );
-    mediaPlayerState->setPlaying( TRUE );
+    mediaPlayerState.setPlaying( FALSE );
+    mediaPlayerState.setPlaying( TRUE );
 }
 
 void MediaPlayer::setPlaying( bool play ) {
     if ( !play ) {
         return;
     }
 
-    if ( mediaPlayerState->isPaused() ) {
-        mediaPlayerState->setPaused( FALSE );
+    if ( mediaPlayerState.isPaused() ) {
+        mediaPlayerState.setPaused( FALSE );
         return;
     }
 
     QString tickerText, time, fileName;
     if ( playList->currentTab() != PlayListWidget::CurrentPlayList ) {
         //if playing in file list.. play in a different way
         // random and looping settings enabled causes problems here,
         // since there is no selected file in the playlist, but a selected file in the file list,
         // so we remember and shutoff
-        l = mediaPlayerState->isLooping();
+        l = mediaPlayerState.isLooping();
         if(l) {
-            mediaPlayerState->setLooping( false );
+            mediaPlayerState.setLooping( false );
         }
-        r = mediaPlayerState->isShuffled();
-        mediaPlayerState->setShuffled( false );
+        r = mediaPlayerState.isShuffled();
+        mediaPlayerState.setShuffled( false );
     }
 
     PlayListWidget::Entry playListEntry = playList->currentEntry();
     fileName = playListEntry.name;
     xineControl->play( playListEntry.file );
 
-    long seconds = mediaPlayerState->length();
+    long seconds = mediaPlayerState.length();
     time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
 
     if( fileName.left(4) == "http" ) {
         fileName = QFileInfo( fileName ).baseName();
        if ( xineControl->getMetaInfo().isEmpty() ) {
            tickerText = tr( " File: " ) + fileName;
        } else {
            tickerText = xineControl->getMetaInfo();
        }
     } else {
         if ( xineControl->getMetaInfo().isEmpty() ) {
             tickerText = tr( " File: " ) + fileName + tr( ", Length: " ) + time + "  ";
         } else {
             tickerText = xineControl->getMetaInfo() + " Length: " + time + "  ";
         }
     }
     audioUI->setTickerText( tickerText );
 }
 
 
 void MediaPlayer::prev() {
     if( playList->currentTab() == PlayListWidget::CurrentPlayList ) { //if using the playlist
         if ( playList->prev() ) {
             play();
-        } else if ( mediaPlayerState->isLooping() ) {
+        } else if ( mediaPlayerState.isLooping() ) {
             if ( playList->last() ) {
                 play();
             }
         } else {
-            mediaPlayerState->setList();
+            mediaPlayerState.setList();
         }
     }
 }
 
 
 void MediaPlayer::next() {
 
     if(playList->currentTab() == PlayListWidget::CurrentPlayList) { //if using the playlist
         if ( playList->next() ) {
             play();
-        } else if ( mediaPlayerState->isLooping() ) {
+        } else if ( mediaPlayerState.isLooping() ) {
             if ( playList->first() ) {
                 play();
             }
         } else {
-            mediaPlayerState->setList();
+            mediaPlayerState.setList();
         }
     } else { //if playing from file list, let's just stop
         qDebug("<<<<<<<<<<<<<<<<<stop for filelists");
-        mediaPlayerState->setPlaying(false);
-        mediaPlayerState->setDisplayType( MediaPlayerState::MediaSelection );
-        if(l) mediaPlayerState->setLooping(l);
-        if(r) mediaPlayerState->setShuffled(r);
+        mediaPlayerState.setPlaying(false);
+        mediaPlayerState.setDisplayType( MediaPlayerState::MediaSelection );
+        if(l) mediaPlayerState.setLooping(l);
+        if(r) mediaPlayerState.setShuffled(r);
     }
     qApp->processEvents();
 }
 
 
 void MediaPlayer::startDecreasingVolume() {
     volumeDirection = -1;
     startTimer( 100 );
     volControl->decVol(2);
 }
 
 
@@ -337,18 +336,18 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
           qDebug("Blank here");
 //          mediaPlayerState->toggleBlank();
           break;
       case Key_F13: //mail
           qDebug("Blank here");
           //  mediaPlayerState->toggleBlank();
           break;
     }
 }
 
 void MediaPlayer::cleanUp() {// this happens on closing
      Config cfg( "OpiePlayer" );
-     mediaPlayerState->writeConfig( cfg );
+     mediaPlayerState.writeConfig( cfg );
      playList->writeDefaultPlaylist( );
 
 //     QPEApplication::grabKeyboard();
 //     QPEApplication::ungrabKeyboard();
 }
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h
index de3886e..6aeac7c 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.h
+++ b/noncore/multimedia/opieplayer2/mediaplayer.h
@@ -32,44 +32,46 @@
 */
 
 #ifndef MEDIA_PLAYER_H
 #define MEDIA_PLAYER_H
 
 #include <qmainwindow.h>
 #include <qframe.h>
 
 #include "xinecontrol.h"
 
 class DocLnk;
 class VolumeControl;
+class MediaPlayerState;
 
 class MediaPlayer : public QObject {
     Q_OBJECT
 public:
-    MediaPlayer( QObject *parent, const char *name );
+    MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name );
     ~MediaPlayer();
 private slots:
     void setPlaying( bool );
     void pauseCheck( bool );
     void play();
     void next();
     void prev();
     void startIncreasingVolume();
     void startDecreasingVolume();
     void stopChangingVolume();
     void cleanUp();
     void blank( bool );
 
 protected:
     void timerEvent( QTimerEvent *e );
     void keyReleaseEvent( QKeyEvent *e);
 private:
     bool isBlanked, l, r;
     int fd, fl;
     int     volumeDirection;
     XineControl *xineControl;
     VolumeControl *volControl;
+    MediaPlayerState &mediaPlayerState;
 };
 
 
 #endif // MEDIA_PLAYER_H