- AudioWidget and VideoWidget are no more singletons via audioUI and

  videoUI. this allows switching skins at run-time (the appropriate
  connections are already made and it works quite nicely :)

7 files changed, 56 insertions, 31 deletions

diff --git a/noncore/multimedia/opieplayer2/main.cpp b/noncore/multimedia/opieplayer2/main.cpp
index 7d11ca0..7fc7b94 100644
--- a/noncore/multimedia/opieplayer2/main.cpp
+++ b/noncore/multimedia/opieplayer2/main.cpp
@@ -1,32 +1,25 @@
 
 #include <qpe/qpeapplication.h>
 #include "mediaplayerstate.h"
 #include "playlistwidget.h"
-#include "audiowidget.h"
-#include "videowidget.h"
 #include "mediaplayer.h"
 
 PlayListWidget *playList;
-AudioWidget *audioUI;
-VideoWidget *videoUI;
 
 int main(int argc, char **argv) {
     QPEApplication a(argc,argv);
 
     MediaPlayerState st( 0, "mediaPlayerState" );
     PlayListWidget pl( st, 0, "playList" );
     playList = &pl;
     pl.showMaximized();
-    AudioWidget aw( st, 0, "audioUI" );
-    audioUI = &aw;
-    VideoWidget vw( st, 0, "videoUI" );
-    videoUI = &vw;
-    a.processEvents();
     MediaPlayer mp( st, 0, "mediaPlayer" );
+    QObject::connect( &pl, SIGNAL( skinSelected() ),
+                      &mp, SLOT( recreateAudioAndVideoWidgets() ) );
 
     a.showMainDocumentWidget(&pl);
 
     return a.exec();
 }
 
 
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index eccb5d9..a9c74c4 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -11,69 +11,62 @@
 #include <qfile.h>
 
 #include "mediaplayer.h"
 #include "playlistwidget.h"
 #include "audiowidget.h"
 #include "videowidget.h"
 #include "volumecontrol.h"
 
 #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;
 
 
 #define FBIOBLANK             0x4611
 
 MediaPlayer::MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name )
     : QObject( parent, name ), volumeDirection( 0 ), mediaPlayerState( _mediaPlayerState ) {
 
+    audioUI = 0;
+    videoUI = 0;
+    xineControl = 0;
+    recreateAudioAndVideoWidgets();
+
     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( 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( 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;
-    xineControl = new XineControl( mediaPlayerState );
     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 );
      }
 }
@@ -338,16 +331,38 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
           break;
       case Key_F13: //mail
           qDebug("Blank here");
           //  mediaPlayerState->toggleBlank();
           break;
     }
 }
 
 void MediaPlayer::cleanUp() {// this happens on closing
      Config cfg( "OpiePlayer" );
      mediaPlayerState.writeConfig( cfg );
      playList->writeDefaultPlaylist( );
 
 //     QPEApplication::grabKeyboard();
 //     QPEApplication::ungrabKeyboard();
 }
+
+void MediaPlayer::recreateAudioAndVideoWidgets()
+{
+    delete xineControl;
+    delete audioUI;
+    delete videoUI;
+    audioUI = new AudioWidget( mediaPlayerState, 0, "audioUI" );
+    videoUI = new VideoWidget( mediaPlayerState, 0, "videoUI" );
+
+    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() ) );
+
+    xineControl = new XineControl( videoUI, mediaPlayerState );
+}
+
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h
index 6aeac7c..0d6f722 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.h
+++ b/noncore/multimedia/opieplayer2/mediaplayer.h
@@ -29,49 +29,58 @@
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef MEDIA_PLAYER_H
 #define MEDIA_PLAYER_H
 
 #include <qmainwindow.h>
 #include <qframe.h>
 
 #include "xinecontrol.h"
 
 class DocLnk;
 class VolumeControl;
 class MediaPlayerState;
+class AudioWidget;
+class VideoWidget;
 
 class MediaPlayer : public QObject {
     Q_OBJECT
 public:
     MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name );
     ~MediaPlayer();
+
+public slots:
+    void recreateAudioAndVideoWidgets();
+
 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;
+    AudioWidget *audioUI;
+    VideoWidget *videoUI;
 };
 
 
 #endif // MEDIA_PLAYER_H
 
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 7ba342b..6bda71e 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -1082,38 +1082,40 @@ void PlayListWidget::populateSkinsMenu() {
         if( skinName == "default" ) {
             defaultSkinIndex = item;
         }
         if( skinName == skin ) {
             skinsMenu->setItemChecked( item, TRUE );
         }
         ++it;
     }
 }
 
 void PlayListWidget::skinsMenuActivated( int item ) {
     for(unsigned int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) {
         skinsMenu->setItemChecked( i, FALSE );
     }
     skinsMenu->setItemChecked( item, TRUE );
 
-    Config cfg( "OpiePlayer" );
-    cfg.setGroup("Options");
-    cfg.writeEntry("Skin", skinsMenu->text( item ) );
-    QMessageBox::warning( this, tr( "OpiePlayer" ),
-                               tr( "You must <b>restart</b> Opieplayer<br>to see your changes." ) );
-} 
+    {
+        Config cfg( "OpiePlayer" );
+        cfg.setGroup("Options");
+        cfg.writeEntry("Skin", skinsMenu->text( item ) );
+    }
+
+    emit skinSelected();
+}
 
 PlayListWidget::TabType PlayListWidget::currentTab() const
 {
     static const TabType indexToTabType[ TabTypeCount ] =
     { CurrentPlayList, AudioFiles, VideoFiles, PlayLists };
 
     int index = tabWidget->currentPageIndex();
     assert( index < TabTypeCount && index >= 0 );
 
     return indexToTabType[ index ];
 }
 
 PlayListWidget::Entry PlayListWidget::currentEntry() const
 {
     if ( currentTab() == CurrentPlayList ) {
         const DocLnk *lnk = current();
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index 3f52e63..ad5c9a3 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -81,32 +81,35 @@ public:
     void useSelectedDocument();
     int selected;
     TabType currentTab() const;
 
     Entry currentEntry() const;
 
 public slots:
     bool first();
     bool last();
     bool next();
     bool prev();
     void writeDefaultPlaylist( );
     QString currentFileListPathName() const;
 protected:
     void keyReleaseEvent( QKeyEvent *e);
 
+signals:
+    void skinSelected();
+
 private:
     int defaultSkinIndex;
     bool audioScan, videoScan, audioPopulated, videoPopulated;
     void readm3u(const QString &);
     void readPls(const QString &);
     void initializeStates();
     void populateAudioView();
     void populateVideoView();
 
     QListView *currentFileListView() const;
 
     bool inFileListMode() const;
 
 private slots:
     void populateSkinsMenu();
     void skinsMenuActivated(int);
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 071ef7c..b4ae783 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -27,35 +27,34 @@
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 
 #include <qtimer.h>
 #include <qmessagebox.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include "xinecontrol.h"
 #include "mediaplayerstate.h"
 #include "videowidget.h"
 
-extern VideoWidget *videoUI;
-XineControl::XineControl( MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name )
-    : QObject( parent, name ), mediaPlayerState( _mediaPlayerState ) {
+XineControl::XineControl( VideoWidget *videoWidget, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name )
+    : QObject( parent, name ), mediaPlayerState( _mediaPlayerState ), videoUI( videoWidget ) {
 
     libXine = new XINE::Lib( videoUI->vidWidget() );
 
     connect ( videoUI, SIGNAL( videoResized( const QSize & )), this, SLOT( videoResized ( const QSize & ) ) );
     connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ),  this, SLOT( pause( bool ) ) );
     connect( this, SIGNAL( positionChanged( long ) ), &mediaPlayerState, SLOT( updatePosition( long ) ) );
     connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );
     connect( &mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) );
     connect( &mediaPlayerState, SIGNAL( positionChanged( long ) ),  this,  SLOT( seekTo( long ) ) );
     connect( &mediaPlayerState,  SIGNAL( videoGammaChanged( int ) ), this,  SLOT( setGamma( int ) ) );
     connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) );
 
     disabledSuspendScreenSaver = FALSE;
 }
 
 XineControl::~XineControl() {
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index 00486f2..24e966b 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -26,36 +26,38 @@
   -_. . .   )=.  =           General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef XINECONTROL_H
 #define XINECONTROL_H
 
 #include "lib.h"
 #include <qobject.h>
 
 #include "mediaplayerstate.h"
 
+class VideoWidget;
+
 class XineControl : public QObject  {
     Q_OBJECT
 public:
-    XineControl( MediaPlayerState &_mediaPlayerState, QObject *parent = 0, const char *name =0 );
+    XineControl( VideoWidget *videoWidget, MediaPlayerState &_mediaPlayerState, QObject *parent = 0, const char *name =0 );
     ~XineControl();
 
     bool hasVideo() const { return hasVideoChannel; }
     bool hasAudio() const { return hasAudioChannel; }
 
 public slots:
     void play( const QString& fileName );
     void stop( bool );
 
     /**
      * Pause the media stream
      * @param if pause or not
      */
     void pause( bool );
 
     /**
@@ -100,20 +102,22 @@ public slots:
 
 
 private:
     XINE::Lib *libXine;
     long m_currentTime;
     long m_position;
     int m_length;
     QString m_fileName;
     bool disabledSuspendScreenSaver : 1;
     bool hasVideoChannel : 1;
     bool hasAudioChannel : 1;
     MediaPlayerState &mediaPlayerState;
 
 signals:
     void positionChanged( long );
 
+private:
+    VideoWidget *videoUI;
 };
 
 
 #endif