- yay, last singleton gone. global playList variable is no more :)

9 files changed, 36 insertions, 40 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index f6e6086..b573c45 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -89,5 +89,5 @@ static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton));
 
-AudioWidget::AudioWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) :
+AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) :
 
-    MediaWidget( mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ),  time( this ) {
+    MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ),  time( this ) {
 
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index f092699..52a358c 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -54,3 +54,3 @@ class AudioWidget : public MediaWidget {
 public:
-    AudioWidget( MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
+    AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
     ~AudioWidget();
diff --git a/noncore/multimedia/opieplayer2/main.cpp b/noncore/multimedia/opieplayer2/main.cpp
index 7fc7b94..ffc7cb6 100644
--- a/noncore/multimedia/opieplayer2/main.cpp
+++ b/noncore/multimedia/opieplayer2/main.cpp
@@ -6,4 +6,2 @@
 
-PlayListWidget *playList;
-
 int main(int argc, char **argv) {
@@ -13,5 +11,4 @@ int main(int argc, char **argv) {
     PlayListWidget pl( st, 0, "playList" );
-    playList = &pl;
     pl.showMaximized();
-    MediaPlayer mp( st, 0, "mediaPlayer" );
+    MediaPlayer mp( pl, st, 0, "mediaPlayer" );
     QObject::connect( &pl, SIGNAL( skinSelected() ),
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index a9c74c4..8acc488 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -26,4 +26,2 @@
 
-extern VideoWidget *videoUI;
-extern PlayListWidget *playList;
 
@@ -32,4 +30,4 @@ extern PlayListWidget *playList;
 
-MediaPlayer::MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name )
-    : QObject( parent, name ), volumeDirection( 0 ), mediaPlayerState( _mediaPlayerState ) {
+MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name )
+    : QObject( parent, name ), volumeDirection( 0 ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) {
 
@@ -41,3 +39,3 @@ MediaPlayer::MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent,
     fd=-1;fl=-1;
-    playList->setCaption( tr( "OpiePlayer: Initializating" ) );
+    playList.setCaption( tr( "OpiePlayer: Initializating" ) );
 
@@ -59,3 +57,3 @@ MediaPlayer::MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent,
     QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default");
-    playList->setCaption( tr( "OpiePlayer: " ) + QFileInfo(currentPlaylist).baseName() );
+    playList.setCaption( tr( "OpiePlayer: " ) + QFileInfo(currentPlaylist).baseName() );
 }
@@ -89,3 +87,3 @@ void MediaPlayer::setPlaying( bool play ) {
     QString tickerText, time, fileName;
-    if ( playList->currentTab() != PlayListWidget::CurrentPlayList ) {
+    if ( playList.currentTab() != PlayListWidget::CurrentPlayList ) {
         //if playing in file list.. play in a different way
@@ -102,3 +100,3 @@ void MediaPlayer::setPlaying( bool play ) {
 
-    PlayListWidget::Entry playListEntry = playList->currentEntry();
+    PlayListWidget::Entry playListEntry = playList.currentEntry();
     fileName = playListEntry.name;
@@ -128,7 +126,7 @@ void MediaPlayer::setPlaying( bool play ) {
 void MediaPlayer::prev() {
-    if( playList->currentTab() == PlayListWidget::CurrentPlayList ) { //if using the playlist
-        if ( playList->prev() ) {
+    if( playList.currentTab() == PlayListWidget::CurrentPlayList ) { //if using the playlist
+        if ( playList.prev() ) {
             play();
         } else if ( mediaPlayerState.isLooping() ) {
-            if ( playList->last() ) {
+            if ( playList.last() ) {
                 play();
@@ -144,7 +142,7 @@ void MediaPlayer::next() {
 
-    if(playList->currentTab() == PlayListWidget::CurrentPlayList) { //if using the playlist
-        if ( playList->next() ) {
+    if(playList.currentTab() == PlayListWidget::CurrentPlayList) { //if using the playlist
+        if ( playList.next() ) {
             play();
         } else if ( mediaPlayerState.isLooping() ) {
-            if ( playList->first() ) {
+            if ( playList.first() ) {
                 play();
@@ -341,3 +339,3 @@ void MediaPlayer::cleanUp() {// this happens on closing
      mediaPlayerState.writeConfig( cfg );
-     playList->writeDefaultPlaylist( );
+     playList.writeDefaultPlaylist( );
 
@@ -352,4 +350,4 @@ void MediaPlayer::recreateAudioAndVideoWidgets()
     delete videoUI;
-    audioUI = new AudioWidget( mediaPlayerState, 0, "audioUI" );
-    videoUI = new VideoWidget( mediaPlayerState, 0, "videoUI" );
+    audioUI = new AudioWidget( playList, mediaPlayerState, 0, "audioUI" );
+    videoUI = new VideoWidget( playList, mediaPlayerState, 0, "videoUI" );
 
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h
index 0d6f722..dc306c4 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.h
+++ b/noncore/multimedia/opieplayer2/mediaplayer.h
@@ -41,2 +41,4 @@
 
+#include "playlistwidget.h"
+
 class DocLnk;
@@ -50,3 +52,3 @@ class MediaPlayer : public QObject {
 public:
-    MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name );
+    MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name );
     ~MediaPlayer();
@@ -79,2 +81,3 @@ private:
     MediaPlayerState &mediaPlayerState;
+    PlayListWidget &playList;
     AudioWidget *audioUI;
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 2992fd6..ed5bc5a 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -23,6 +23,4 @@
 
-extern PlayListWidget *playList;
-
-MediaWidget::MediaWidget( MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name )
-    : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState )
+MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name )
+    : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState ), playList( _playList )
 {
@@ -50,4 +48,4 @@ void MediaWidget::handleCommand( Command command, bool buttonDown )
         case Stop:       mediaPlayerState.setPlaying(FALSE); return;
-        case Next:       if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return;
-        case Previous:   if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return;
+        case Next:       if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return;
+        case Previous:   if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return;
         case Loop:       mediaPlayerState.setLooping( buttonDown ); return;
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index e3f09ce..2d92d65 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -25,2 +25,3 @@
 #include "mediaplayerstate.h"
+#include "playlistwidget.h"
 
@@ -32,3 +33,3 @@ public:
 
-    MediaWidget( MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 );
+    MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 );
     virtual ~MediaWidget();
@@ -52,2 +53,3 @@ protected:
     MediaPlayerState &mediaPlayerState;
+    PlayListWidget &playList;
 };
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index c0039b1..b7305fe 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -55,3 +55,2 @@
 
-extern PlayListWidget *playList;
 
@@ -83,6 +82,5 @@ static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton));
 
-VideoWidget::VideoWidget(MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) :
-MediaWidget( mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) {
-
-
+VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) 
+    : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) 
+{
     setCaption( tr("OpiePlayer - Video") );
@@ -334,4 +332,4 @@ 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 VideoNext:       if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return;
+		case VideoPrevious:   if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return;
                 case VideoVolUp:      emit moreReleased(); return;
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index ae0e687..f996803 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -60,3 +60,3 @@ class VideoWidget : public MediaWidget {
 public:
-    VideoWidget( MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
+    VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
     ~VideoWidget();