merge branch with head

1 files changed, 39 insertions, 30 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index a1a1016..9a9e1ec 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -36,36 +36,41 @@
 #include <opie/ofiledialog.h>
 
 #include <qmessagebox.h>
 
 #include "playlistselection.h"
 #include "playlistwidget.h"
+#include "mediaplayer.h"
 #include "mediaplayerstate.h"
 #include "inputDialog.h"
 #include "om3u.h"
 #include "playlistfileview.h"
 
 //only needed for the random play
 #include <assert.h>
 
-PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name )
-    : PlayListWidgetGui( mediaPlayerState, parent, name ) , currentFileListView( 0 )
+PlayListWidget::PlayListWidget(QWidget* parent, const char* name, WFlags fl )
+    : PlayListWidgetGui( parent, "playList" ) , currentFileListView( 0 )
 {
+    mediaPlayerState = new MediaPlayerState(0, "mediaPlayerState" );
+    m_mp = new MediaPlayer(*this, *mediaPlayerState, 0, "mediaPlayer");
+
+
 
     d->tbAddToList =  new ToolButton( bar, tr( "Add to Playlist" ),
                                       "opieplayer2/add_to_playlist",
                                       this , SLOT(addSelected() ) );
     d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ),
                                           "opieplayer2/remove_from_playlist",
                                           this , SLOT(removeSelected() ) );
     d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer2/play",
                                    this , SLOT( btnPlay( bool) ), TRUE );
     d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle",
-                                   &mediaPlayerState, SLOT( setShuffled( bool ) ), TRUE );
+                                   mediaPlayerState, SLOT( setShuffled( bool ) ), TRUE );
     d->tbLoop    = new ToolButton( bar, tr( "Loop" ), "opieplayer2/loop",
-                                   &mediaPlayerState, SLOT( setLooping( bool ) ), TRUE );
+                                   mediaPlayerState, SLOT( setLooping( bool ) ), TRUE );
 
     (void)new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) );
     (void)new MenuItem( pmPlayList, tr( "Add all audio files" ),
                         this, SLOT( addAllMusicToList() ) );
     (void)new MenuItem( pmPlayList, tr( "Add all video files" ),
                         this, SLOT( addAllVideoToList() ) );
@@ -83,17 +88,17 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par
     (void)new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ),
                         audioView, SLOT( scanFiles() ) );
     (void)new MenuItem( pmPlayList, tr( "Rescan for Video Files" ),
                         videoView, SLOT( scanFiles() ) );
 
     pmView->insertItem(  Resource::loadPixmap("fullscreen") , tr( "Full Screen"),
-                         &mediaPlayerState, SLOT( toggleFullscreen() ) );
+                         mediaPlayerState, SLOT( toggleFullscreen() ) );
 
     Config cfg( "OpiePlayer" );
     bool b= cfg.readBoolEntry("FullScreen", 0);
-    mediaPlayerState.setFullscreen(  b );
+    mediaPlayerState->setFullscreen(  b );
     pmView->setItemChecked( -16, b );
 
     (void)new ToolButton( vbox1, tr( "Move Up" ), "opieplayer2/up",
                           d->selectedFiles, SLOT(moveSelectedUp() ) );
     (void)new ToolButton( vbox1, tr( "Remove" ), "opieplayer2/cut",
                           d->selectedFiles, SLOT(removeSelected() ) );
@@ -122,22 +127,25 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par
     connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ),
              this, SLOT( addToSelection( QListViewItem *) ) );
     connect( playLists, SIGNAL( fileSelected( const DocLnk &) ),
              this, SLOT( loadList( const DocLnk & ) ) );
     connect( tabWidget, SIGNAL ( currentChanged(QWidget*) ),
              this, SLOT( tabChanged( QWidget* ) ) );
-    connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ),
+    connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ),
              d->tbPlay,  SLOT( setOn( bool ) ) );
-    connect( &mediaPlayerState, SIGNAL( loopingToggled( bool ) ),
+    connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ),
              d->tbLoop, SLOT( setOn( bool ) ) );
-    connect( &mediaPlayerState, SIGNAL( shuffledToggled( bool ) ),
+    connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ),
              d->tbShuffle, SLOT( setOn( bool ) ) );
     connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ),
              this, SLOT( playIt( QListViewItem *) ) );
     connect ( gammaSlider,  SIGNAL( valueChanged( int ) ),
-              &mediaPlayerState,  SLOT( setVideoGamma( int ) ) );
+              mediaPlayerState,  SLOT( setVideoGamma( int ) ) );
+
+    connect( this, SIGNAL(skinSelected() ),
+             m_mp, SLOT( reloadSkins() ) );
 
     // see which skins are installed
     populateSkinsMenu();
     initializeStates();
 
     channel = new QCopChannel( "QPE/Application/opieplayer2", this );
@@ -152,19 +160,20 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par
     tabWidget->showPage( playListTab );
 }
 
 
 PlayListWidget::~PlayListWidget() {
     delete d;
+    delete m_mp;
 }
 
 
 void PlayListWidget::initializeStates() {
-    d->tbPlay->setOn( mediaPlayerState.isPlaying() );
-    d->tbLoop->setOn( mediaPlayerState.isLooping() );
-    d->tbShuffle->setOn( mediaPlayerState.isShuffled() );
+    d->tbPlay->setOn( mediaPlayerState->isPlaying() );
+    d->tbLoop->setOn( mediaPlayerState->isLooping() );
+    d->tbShuffle->setOn( mediaPlayerState->isShuffled() );
     d->playListFrame->show();
 }
 
 void PlayListWidget::writeDefaultPlaylist() {
 
     Config config( "OpiePlayer" );
@@ -338,14 +347,14 @@ void PlayListWidget::setDocument( const QString& fileref ) {
         lnk.setName( fileInfo.baseName() ); //sets name
         lnk.setFile( fileref ); //sets file name
         addToSelection( lnk );
         writeCurrentM3u();
 
         d->setDocumentUsed = TRUE;
-        mediaPlayerState.setPlaying( FALSE );
-        mediaPlayerState.setPlaying( TRUE );
+        mediaPlayerState->setPlaying( FALSE );
+        mediaPlayerState->setPlaying( TRUE );
     }
 }
 
 
 void PlayListWidget::useSelectedDocument() {
     d->setDocumentUsed = FALSE;
@@ -363,13 +372,13 @@ const DocLnk *PlayListWidget::current() const { // this is fugly
     assert( lnk );
     return lnk;
 }
 
 
 bool PlayListWidget::prev() {
-    if ( mediaPlayerState.isShuffled() ) {
+    if ( mediaPlayerState->isShuffled() ) {
         const DocLnk *cur = current();
         int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
         for ( int i = 0; i < j; i++ ) {
             if ( !d->selectedFiles->next() )
                 d->selectedFiles->first();
         }
@@ -377,30 +386,30 @@ bool PlayListWidget::prev() {
             if ( !d->selectedFiles->next() ) {
                 d->selectedFiles->first();
             }
         return TRUE;
     } else {
         if ( !d->selectedFiles->prev() ) {
-            if ( mediaPlayerState.isLooping() ) {
+            if ( mediaPlayerState->isLooping() ) {
                 return d->selectedFiles->last();
             } else {
                 return FALSE;
             }
         }
         return TRUE;
     }
 }
 
 
 bool PlayListWidget::next() {
 //qDebug("<<<<<<<<<<<<next()");
-    if ( mediaPlayerState.isShuffled() ) {
+    if ( mediaPlayerState->isShuffled() ) {
         return prev();
     } else {
         if ( !d->selectedFiles->next() ) {
-            if ( mediaPlayerState.isLooping() ) {
+            if ( mediaPlayerState->isLooping() ) {
                 return d->selectedFiles->first();
             } else {
                 return FALSE;
             }
         }
         return TRUE;
@@ -460,14 +469,14 @@ void PlayListWidget::removeSelected() {
     writeCurrentM3u();
 }
 
 
 void PlayListWidget::playIt( QListViewItem *it) {
     if(!it) return;
-    mediaPlayerState.setPlaying(FALSE);
-    mediaPlayerState.setPlaying(TRUE);
+    mediaPlayerState->setPlaying(FALSE);
+    mediaPlayerState->setPlaying(TRUE);
     d->selectedFiles->unSelect();
 }
 
 
 void PlayListWidget::addToSelection( QListViewItem *it) {
   d->setDocumentUsed = FALSE;
@@ -562,13 +571,13 @@ void PlayListWidget::tabChanged(QWidget *) {
     };
 }
 
 
 void PlayListWidget::btnPlay(bool b) {
 //    mediaPlayerState->setPlaying(false);
-    mediaPlayerState.setPlaying(b);
+    mediaPlayerState->setPlaying(b);
     insanityBool=FALSE;
 }
 
 void PlayListWidget::deletePlaylist() {
   switch( QMessageBox::information( this, (tr("Remove Playlist?")),
                                     (tr("You really want to delete\nthis playlist?")),
@@ -906,14 +915,14 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) {
 
 void PlayListWidget::pmViewActivated(int index) {
 //  qDebug("%d", index);
     switch(index) {
     case -16:
     {
-        mediaPlayerState.toggleFullscreen();
-        bool b=mediaPlayerState.isFullscreen();
+        mediaPlayerState->toggleFullscreen();
+        bool b=mediaPlayerState->isFullscreen();
         pmView->setItemChecked( index, b);
         Config cfg( "OpiePlayer" );
         cfg.writeEntry( "FullScreen", b );
     }
     break;
     };
@@ -993,23 +1002,23 @@ QString PlayListWidget::currentFileListPathName() const {
 void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) {
    qDebug("qcop message "+msg );
    QDataStream stream ( data, IO_ReadOnly );
    if ( msg == "play()" ) { //plays current selection
       btnPlay( true);
    } else if ( msg == "stop()" ) {
-      mediaPlayerState.setPlaying( false);
+      mediaPlayerState->setPlaying( false);
    } else if ( msg == "togglePause()" ) {
-      mediaPlayerState.togglePaused();
+      mediaPlayerState->togglePaused();
    } else if ( msg == "next()" ) { //select next in list
-      mediaPlayerState.setNext();
+      mediaPlayerState->setNext();
    } else if ( msg == "prev()" ) { //select previous in list
-      mediaPlayerState.setPrev();
+      mediaPlayerState->setPrev();
    } else if ( msg == "toggleLooping()" ) { //loop or not loop
-      mediaPlayerState.toggleLooping();
+      mediaPlayerState->toggleLooping();
    } else if ( msg == "toggleShuffled()" ) { //shuffled or not shuffled
-      mediaPlayerState.toggleShuffled();
+      mediaPlayerState->toggleShuffled();
    } else if ( msg == "volUp()" ) { //volume more
 //       emit moreClicked();
 //       emit moreReleased();
    } else if ( msg == "volDown()" ) { //volume less
 //       emit lessClicked();
 //       emit lessReleased();