fix setDocument handling

2 files changed, 23 insertions, 11 deletions

diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index c6de5e6..5d0f6de 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -354,34 +354,35 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
     connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
 
     setCentralWidget( vbox5 );
 
     Config cfg( "OpiePlayer" );
     readConfig( cfg );
     QString currentPlaylist = cfg.readEntry("CurrentPlaylist","default");
     loadList(DocLnk( currentPlaylist));
     setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(currentPlaylist)));
     
     initializeStates();
+    //    audioUI->setFocus();
 }
 
 
 PlayListWidget::~PlayListWidget() {
     Config cfg( "OpiePlayer" );
     writeConfig( cfg );
 
     if ( d->current )
         delete d->current;
-    delete d;
+      if(d) delete d;
 }
 
 
 void PlayListWidget::initializeStates() {
 
     d->tbPlay->setOn( mediaPlayerState->playing() );
     d->tbLoop->setOn( mediaPlayerState->looping() );
     d->tbShuffle->setOn( mediaPlayerState->shuffled() );
     setPlaylist( true);
 }
 
 
@@ -485,33 +486,40 @@ void PlayListWidget::addAllVideoToList() {
     QListIterator<DocLnk> dit( vFiles.children() );
     for ( ; dit.current(); ++dit )
         if(QFileInfo( dit.current()->file()).exists())
             d->selectedFiles->addToSelection( **dit );
     tabWidget->setCurrentPage(0);
     
     writeCurrentM3u();
     d->selectedFiles->first();
 }
 
 
 void PlayListWidget::setDocument(const QString& fileref) {
-    qDebug(fileref);
-    fromSetDocument = TRUE;
+   fromSetDocument = true;
+   d->setDocumentUsed = TRUE;
+   mediaPlayerState->setPlaying( FALSE );
+   qApp->processEvents();
+   mediaPlayerState->setPlaying( TRUE );
+}
+
+void PlayListWidget::setDocumentEx(const QString& fileref) {
+
     QFileInfo fileInfo(fileref);
     if ( !fileInfo.exists() ) {
         QMessageBox::critical( 0, tr( "Invalid File" ),
                                tr( "There was a problem in getting the file." ) );
         return;
     }
-//    qDebug("setDocument "+fileref);
+    qDebug("setDocument "+fileref);
     QString extension = fileInfo.extension(false);
     if( extension.find( "m3u", 0, false) != -1) { //is m3u
         readm3u( fileref);
     }
         else if( extension.find( "pls", 0, false) != -1 ) { //is pls
         readPls( fileref);
     }
     else if( fileref.find("playlist",0,TRUE) != -1) {//is playlist
         clearList();
         DocLnk lnk;
         lnk.setName( fileInfo.baseName() ); //sets name
         lnk.setFile( fileref ); //sets file name
@@ -521,25 +529,25 @@ void PlayListWidget::setDocument(const QString& fileref) {
         d->selectedFiles->first();
     } else { 
         clearList();
         DocLnk lnk;
         lnk.setName( fileInfo.baseName() ); //sets name
         lnk.setFile( fileref ); //sets file name
         addToSelection( lnk );
 //        addToSelection( DocLnk( fileref ) );
         d->setDocumentUsed = TRUE;
         mediaPlayerState->setPlaying( FALSE );
         qApp->processEvents();
         mediaPlayerState->setPlaying( TRUE );
-        qApp->processEvents();
+        //        qApp->processEvents();
         setCaption(tr("OpiePlayer"));
     }
 }
 
 
 void PlayListWidget::setActiveWindow() {
         qDebug("SETTING active window");
 
       // When we get raised we need to ensure that it switches views
     char origView = mediaPlayerState->view();
     mediaPlayerState->setView( 'l' ); // invalidate
     mediaPlayerState->setView( origView ); // now switch back
@@ -750,47 +758,48 @@ void PlayListWidget::addSelected() {
   writeCurrentM3u();          
 
 }
 
 void PlayListWidget::removeSelected() {
     d->selectedFiles->removeSelected( );
 }
 
 void PlayListWidget::playIt( QListViewItem *) {
 //   d->setDocumentUsed = FALSE;
 //  mediaPlayerState->curPosition =0;
     qDebug("playIt");
-    mediaPlayerState->setPlaying(FALSE);
+    //    mediaPlayerState->setPlaying(FALSE);
     mediaPlayerState->setPlaying(TRUE);
     d->selectedFiles->unSelect();
 }
 
 void PlayListWidget::addToSelection( QListViewItem *it) {
   d->setDocumentUsed = FALSE;
 
   if(it) {
     switch ( tabWidget->currentPageIndex()) {
     case 0: //playlist
       return;
       break;
     };
     //      case 1: {
     DocLnk lnk;
     QString filename;
 
     filename=it->text(3);
     lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name
     lnk.setFile( filename ); //sets file name
     d->selectedFiles->addToSelection(  lnk);
  
+   if(tabWidget->currentPageIndex() == 0)
     writeCurrentM3u();          
 //    tabWidget->setCurrentPage(0);
         
   }
 }
 
 void PlayListWidget::tabChanged(QWidget *) {
 
     switch ( tabWidget->currentPageIndex()) {
       case 0:
       {
           if( !tbDeletePlaylist->isHidden())
@@ -822,58 +831,58 @@ void PlayListWidget::tabChanged(QWidget *) {
       break;
       case 3:
       {
           if( tbDeletePlaylist->isHidden())
               tbDeletePlaylist->show();
           playLists->reread();
       }
       break;
     };
 }
 
 void PlayListWidget::btnPlay(bool b) {
-    qDebug("<<<<<<<<<<<<<<<BtnPlay");
+    qDebug("<<<<<<<<<<<<<<<BtnPlay %d", b);
 //    mediaPlayerState->setPlaying(b);
     switch ( tabWidget->currentPageIndex()) {
       case 0:
       {
           qDebug("1");
 //            if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1
 //                if( d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) {
 //                 QMessageBox::message("Note","You are trying to play\na malformed url.");
 //            } else {
           mediaPlayerState->setPlaying(b);
           insanityBool=FALSE;
           qDebug("insanity");              
 //          }
     }
       break;
       case 1:
       {
           qDebug("2");
 //          d->selectedFiles->unSelect();
           addToSelection( audioView->currentItem() );
-          mediaPlayerState->setPlaying(true);
+          mediaPlayerState->setPlaying( b);
             d->selectedFiles->removeSelected( );
             d->selectedFiles->unSelect();
            tabWidget->setCurrentPage(1);
           insanityBool=FALSE;         
       }//          audioView->clearSelection();
       break;
       case 2:
       {
           qDebug("3");
           
           addToSelection( videoView->currentItem() );
-          mediaPlayerState->setPlaying(true);
+          mediaPlayerState->setPlaying( b);
 //          qApp->processEvents();
           d->selectedFiles->removeSelected( );
           d->selectedFiles->unSelect();
           tabWidget->setCurrentPage(2);
           insanityBool=FALSE;
       }//          videoView->clearSelection();
       break;
     };
  
 }
 
 void PlayListWidget::deletePlaylist() {
@@ -1450,45 +1459,47 @@ void PlayListWidget::skinsMenuActivated( int item ) {
     cfg.writeEntry("Skin", skinsMenu->text( item ) );
 }
 
 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);
    } else if ( msg == "togglePause()" ) {
       mediaPlayerState->togglePaused();
-   } else if ( msg == "next()" ) { //select next in list
+   } else if ( msg == "next()" ) { //select next in lis
       mediaPlayerState->setNext();      
    } else if ( msg == "prev()" ) { //select previous in list
       mediaPlayerState->setPrev();      
    } else if ( msg == "toggleLooping()" ) { //loop or not loop
       mediaPlayerState->toggleLooping();
    } else if ( msg == "toggleShuffled()" ) { //shuffled or not shuffled
       mediaPlayerState->toggleShuffled();
    } else if ( msg == "volUp()" ) { //volume more
 //       emit moreClicked();
 //       emit moreReleased();
    } else if ( msg == "volDown()" ) { //volume less
 //       emit lessClicked();
 //       emit lessReleased();
    } else if ( msg == "play(QString)" ) { //play this now
       QString file;
       stream >> file;
-      setDocument( (const QString &) file);
+      setDocumentEx( (const QString &) file);
    } else if ( msg == "add(QString)" ) { //add to playlist
       QString file;
       stream >> file;
       QFileInfo fileInfo(file);
       DocLnk lnk;
       lnk.setName( fileInfo.baseName() ); //sets name
       lnk.setFile( file ); //sets file name
       addToSelection( lnk );
    } else if ( msg == "rem(QString)" ) { //remove from playlist
       QString file;
       stream >> file;
 
+   } else if ( msg == "setDocument(QString)" ) { //loop or not loop
+    QCopEnvelope h("QPE/Application/opieplayer", "raise()");
    }
    
 }
diff --git a/core/multimedia/opieplayer/playlistwidget.h b/core/multimedia/opieplayer/playlistwidget.h
index e66bcb9..0c0e367 100644
--- a/core/multimedia/opieplayer/playlistwidget.h
+++ b/core/multimedia/opieplayer/playlistwidget.h
@@ -93,24 +93,25 @@ private:
     void populateVideoView();
 private slots:
 
     void qcopReceive(const QCString&, const QByteArray&);
     void populateSkinsMenu();
     void skinsMenuActivated(int);
     void writem3u();
     void writeCurrentM3u();
     void scanForAudio();
     void scanForVideo(); 
     void openFile();
     void setDocument( const QString& fileref );
+    void setDocumentEx( const QString& fileref );
     void addToSelection( const DocLnk& ); // Add a media file to the playlist
     void addToSelection( QListViewItem* ); // Add a media file to the playlist
     void setActiveWindow(); // need to handle this to show the right view
     void setPlaylist( bool ); // Show/Hide the playlist
     void setView( char );
     void clearList(); 
     void addAllToList(); 
     void addAllMusicToList(); 
     void addAllVideoToList(); 
     void saveList();  // Save the playlist
     void loadList( const DocLnk &);  // Load a playlist
     void playIt( QListViewItem *);