1 files changed, 58 insertions, 89 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 8e88e9b..a6a9eca 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -148,211 +148,219 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ),
              this, SLOT( setPlaylist( bool ) ) );
     connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ),
              this, SLOT( playIt( QListViewItem *) ) );
     connect ( gammaSlider,  SIGNAL( valueChanged( int ) ),
               mediaPlayerState,  SLOT( setVideoGamma( int ) ) );
 
     // see which skins are installed
     videoScan=FALSE;
     audioScan=FALSE;
     populateSkinsMenu();
     initializeStates();
 
     cfg.setGroup("PlayList");
     QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default");
     loadList(DocLnk(  currentPlaylist ) );
     
 }
 
 
 PlayListWidget::~PlayListWidget() {
     if ( d->current ) {
         delete d->current;
     }
     delete d;
 }
 
 
 void PlayListWidget::initializeStates() {
     d->tbPlay->setOn( mediaPlayerState->playing() );
     d->tbLoop->setOn( mediaPlayerState->looping() );
     d->tbShuffle->setOn( mediaPlayerState->shuffled() );
     setPlaylist( true );
 }
 
 void PlayListWidget::writeDefaultPlaylist() {
 
     Config config( "OpiePlayer" );
     config.setGroup( "PlayList" );
     QString filename=QPEApplication::documentDir() + "/default.m3u";
     QString currentString = config.readEntry( "CurrentPlaylist", filename);
     if( currentString == filename) {
       Om3u *m3uList;
       //    qDebug("<<<<<<<<<<<<<default>>>>>>>>>>>>>>>>>>>");
       if( d->selectedFiles->first() ) {
         m3uList = new Om3u(filename, IO_ReadWrite | IO_Truncate);
         do {
           //        qDebug(d->selectedFiles->current()->file());
           m3uList->add( d->selectedFiles->current()->file() );
         }
         while ( d->selectedFiles->next() );
 
         m3uList->write();
         m3uList->close();
         if(m3uList) delete m3uList;
         
       }
     }
 }
 
 void PlayListWidget::addToSelection( const DocLnk& lnk ) {
     d->setDocumentUsed = FALSE;
     if ( mediaPlayerState->playlist() ) {
         if( QFileInfo( lnk.file() ).exists() ||
-            lnk.file().left(4) == "http" )
+            lnk.file().left(4) == "http" ) {
             d->selectedFiles->addToSelection( lnk );
+        }
 //          writeCurrentM3u();          
     }
     else
         mediaPlayerState->setPlaying( TRUE );
 }
 
 
 void PlayListWidget::clearList() {
     while ( first() ) {
         d->selectedFiles->removeSelected();
     }
 }
 
 void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint& , int) {
     switch (mouse) {
     case 1:
         break;
     case 2:
     {
         QPopupMenu  m;
         m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
         m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
         m.exec( QCursor::pos() );
     }
         break;
     }
 }
 
 
 void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoint& , int ) {
     switch (mouse) {
     case 1:
         break;
     case 2:
     {
         QPopupMenu  m;
         m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
         m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
         m.exec( QCursor::pos() );
     }
     break;
     }
 }
 
 
 void PlayListWidget::addAllToList() {
     DocLnkSet filesAll;
     Global::findDocuments(&filesAll, "video/*;"+audioMimes);
     QListIterator<DocLnk> Adit( filesAll.children() );
     for ( ; Adit.current(); ++Adit ) {
         if( QFileInfo( Adit.current()->file() ).exists() ) {
             d->selectedFiles->addToSelection( **Adit );
         }
     }
-    writeCurrentM3u();          
+    tabWidget->setCurrentPage(0);
+    
+    writeCurrentM3u();
+    d->selectedFiles->first();
 }
 
 
 void PlayListWidget::addAllMusicToList() {
     if(!audioScan)
         scanForAudio();
     QListIterator<DocLnk> dit( files.children() );
     for ( ; dit.current(); ++dit ) {
         if( QFileInfo(dit.current()->file() ).exists() ) {
             d->selectedFiles->addToSelection( **dit );
         }
     }
-    writeCurrentM3u();          
+    tabWidget->setCurrentPage(0);
+    writeCurrentM3u();
+    d->selectedFiles->first();
 }
 
 
 void PlayListWidget::addAllVideoToList() {
     if(!videoScan)
         scanForVideo();
     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( "<<<<<<<<set document>>>>>>>>>> "+fileref );
     fromSetDocument = TRUE;
     if ( fileref.isNull() ) {
         QMessageBox::warning( this, tr( "Invalid File" ),
                                tr( "There was a problem in getting the file." ) );
         return;
     }
 
     clearList();
     if( fileref.find( "m3u", 0, TRUE) != -1  ) { //is m3u
         readm3u( fileref );
     } else if( DocLnk( fileref).file().find( "m3u", 0, TRUE) != -1 ) {
         readm3u( DocLnk( fileref).file() );
     } else if( fileref.find( "pls", 0, TRUE) != -1 ) { //is pls
         readPls( fileref );
     } else if( DocLnk( fileref).file().find( "pls", 0, TRUE) != -1 ) {
         readPls( DocLnk( fileref).file() );
     } else {
         clearList();
         addToSelection( DocLnk( fileref ) );
         writeCurrentM3u();          
         
         d->setDocumentUsed = TRUE;
         mediaPlayerState->setPlaying( FALSE );
         mediaPlayerState->setPlaying( TRUE );
     }
 }
 
 
 void PlayListWidget::useSelectedDocument() {
     d->setDocumentUsed = FALSE;
 }
 
 
 const DocLnk *PlayListWidget::current() { // this is fugly
     switch ( whichList() ) {
       case 0: //playlist
       {
 //      qDebug("playlist");
           if ( mediaPlayerState->playlist() ) {
               return d->selectedFiles->current();
           } else if ( d->setDocumentUsed && d->current ) {
               return d->current;
           } else {
               return &(d->files->selectedDocument());
           }
       }
       break;
     };
     return 0;
 }
 
 
 bool PlayListWidget::prev() {
     if ( mediaPlayerState->playlist() ) {
         if ( mediaPlayerState->shuffled() ) {
             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() )
@@ -362,254 +370,215 @@ bool PlayListWidget::prev() {
                 if ( !d->selectedFiles->next() ) {
                     d->selectedFiles->first();
                 }
             return TRUE;
         } else {
             if ( !d->selectedFiles->prev() ) {
                 if ( mediaPlayerState->looping() ) {
                     return d->selectedFiles->last();
                 } else {
                     return FALSE;
                 }
             }
             return TRUE;
         }
     } else {
         return mediaPlayerState->looping();
   }
 }
 
 
 bool PlayListWidget::next() {
 //qDebug("<<<<<<<<<<<<next()");
  if ( mediaPlayerState->playlist() ) {
         if ( mediaPlayerState->shuffled() ) {
             return prev();
         } else {
             if ( !d->selectedFiles->next() ) {
                 if ( mediaPlayerState->looping() ) {
                     return d->selectedFiles->first();
                 } else {
                     return FALSE;
                 }
             }
             return TRUE;
         }
     } else {
         return mediaPlayerState->looping();
     }
 }
 
 
 bool PlayListWidget::first() {
     if ( mediaPlayerState->playlist() )
         return d->selectedFiles->first();
     else
         return mediaPlayerState->looping();
 }
 
 
 bool PlayListWidget::last() {
     if ( mediaPlayerState->playlist() )
         return d->selectedFiles->last();
     else
         return mediaPlayerState->looping();
 }
 
 
  void PlayListWidget::saveList() {
    writem3u();
  }
 
 
 void PlayListWidget::loadList( const DocLnk & lnk) {
     QString name = lnk.name();
-  qDebug("<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name);
+    //  qDebug("<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name);
 
     if( name.length()>0) {
         setCaption("OpiePlayer: "+name);
-       qDebug("<<<<<<<<<<<<load list "+ lnk.file());
+//       qDebug("<<<<<<<<<<<<load list "+ lnk.file());
         clearList();
         readm3u(lnk.file());
         tabWidget->setCurrentPage(0);
     }
 }
 
 
 void PlayListWidget::setPlaylist( bool shown ) {
     if ( shown ) {
         d->playListFrame->show();
     } else {
         d->playListFrame->hide();
     }
 }
 
 
 void PlayListWidget::addSelected() {
-    qDebug("addSelected");
-    switch (whichList()) {
-      case 0: //playlist
-          break;
-      case 1: { //audio
-          QListViewItemIterator it(  audioView  );
-            // iterate through all items of the listview
-          for ( ; it.current(); ++it ) {
-              if ( it.current()->isSelected() ) {
-                  QListIterator<DocLnk> dit( files.children() );
-                  for ( ; dit.current(); ++dit ) {
-                      if( dit.current()->name() == it.current()->text(0) ) {
-                        if( QFileInfo( dit.current()->file()).exists()) {
-                              d->selectedFiles->addToSelection(  **dit );
-                              audioView->setSelected( it.current(),FALSE);
-                        }
-                      }
-                  }
-              }
-          }
-//          tabWidget->setCurrentPage(0);
-          writeCurrentM3u();          
-    d->selectedFiles->next();
-      }
-          break;
-      case 2: { // video
-          QListViewItemIterator it(  videoView  );
-            // iterate through all items of the listview
-          for ( ; it.current(); ++it ) {
-              if ( it.current()->isSelected() ) {
-                  QListIterator<DocLnk> dit( vFiles.children() );
-                  for ( ; dit.current(); ++dit ) {
-                      if( dit.current()->name() == it.current()->text(0) ) {
-                        if(QFileInfo( dit.current()->file()).exists()) {
-                              d->selectedFiles->addToSelection(  **dit );
-                              videoView->setSelected( it.current(),FALSE);
-                        }
-                      }
-                  }
-              }
-          }
-//          tabWidget->setCurrentPage(0);
-          writeCurrentM3u();          
+  qDebug("addSelected");
+  DocLnk lnk;
+  QString filename;
+  switch (whichList()) {
+
+  case 0: //playlist
+    return;
+    break;
+  case 1: { //audio
+    filename=audioView->currentItem()->text(3);
+    //    d->selectedFiles->next();
+  }
+    break;
     
-      }
-          break;
-    };
+  case 2: { // video
+    filename=videoView->currentItem()->text(3);
+    //          tabWidget->setCurrentPage(0);
+    
+  }
+    break;
+  };
+  lnk.setName( QFileInfo(filename).baseName() ); //sets name
+  lnk.setFile( filename ); //sets file name
+  d->selectedFiles->addToSelection(  lnk);
+  tabWidget->setCurrentPage(0);
+  writeCurrentM3u();          
 }
 
 
 void PlayListWidget::removeSelected() {
     d->selectedFiles->removeSelected( );
     writeCurrentM3u();          
 }
 
 
 void PlayListWidget::playIt( QListViewItem *it) {
     if(!it) return;
     mediaPlayerState->setPlaying(FALSE);
     mediaPlayerState->setPlaying(TRUE);
     d->selectedFiles->unSelect();
 }
 
 
 void PlayListWidget::addToSelection( QListViewItem *it) {
-    d->setDocumentUsed = FALSE;
+  d->setDocumentUsed = FALSE;
 
-    if(it) {
-        switch ( whichList()) {
-          case 1: {
-              QListIterator<DocLnk> dit( files.children() );
-              for ( ; dit.current(); ++dit ) {
-                  if( dit.current()->name() == it->text(0)) {
-                      if(QFileInfo( dit.current()->file()).exists()) {
-                          d->selectedFiles->addToSelection(  **dit );
-//                          qDebug("blah "+ dit.current()->name());
-//                          d->selectedFiles->setSelectedItem( dit.current()->name());
-                      }
-                  }
-              }
-              writeCurrentM3u();          
-          }
-              break;
-          case 2: {
-              QListIterator<DocLnk> dit( vFiles.children() );
-              for ( ; dit.current(); ++dit ) {
-                  if( dit.current()->name() == it->text(0)) {
-                      if( QFileInfo( dit.current()->file()).exists() ) {
-                          d->selectedFiles->addToSelection(  **dit );
-//                          qDebug("blah "+ dit.current()->name());
-//                          d->selectedFiles->setSelectedItem( dit.current()->name());
-                      }
-                  }
-              }
-              writeCurrentM3u();          
-            
-          }
-              break;
-          case 0:
-              break;
-        };
-        tabWidget->setCurrentPage(0);
+  if(it) {
+    switch ( whichList()) {
+    case 0: //playlist
+      return;
+      break;
+    };
+    //      case 1: {
+    DocLnk lnk;
+    QString filename;
+
+    filename=it->text(3);
+    lnk.setName( QFileInfo(filename).baseName() ); //sets name
+    lnk.setFile( filename ); //sets file name
+    d->selectedFiles->addToSelection(  lnk);
+ 
+    writeCurrentM3u();          
+    tabWidget->setCurrentPage(0);
         
-    }
+  }
 }
 
 
 void PlayListWidget::tabChanged(QWidget *) {
 
     switch ( whichList()) {
     case 0:
     {
         if( !tbDeletePlaylist->isHidden() )  {
             tbDeletePlaylist->hide();
         }
         d->tbRemoveFromList->setEnabled(TRUE);
         d->tbAddToList->setEnabled(FALSE);
     }
     break;
     case 1:
     {
         audioView->clear();
         populateAudioView();
 
         if( !tbDeletePlaylist->isHidden() ) {
             tbDeletePlaylist->hide();
         }
         d->tbRemoveFromList->setEnabled(FALSE);
         d->tbAddToList->setEnabled(TRUE);
     }
     break;
     case 2:
     {
         videoView->clear();
         populateVideoView();
         if( !tbDeletePlaylist->isHidden() ) {
             tbDeletePlaylist->hide();
         }
         d->tbRemoveFromList->setEnabled(FALSE);
         d->tbAddToList->setEnabled(TRUE);
     }
     break;
     case 3:
     {
         if( tbDeletePlaylist->isHidden() ) {
             tbDeletePlaylist->show();
         }
         playLists->reread();
     }
     break;
     };
 }
 
 
 void PlayListWidget::btnPlay(bool b) {
 //    mediaPlayerState->setPlaying(false);
     mediaPlayerState->setPlaying(b);
     insanityBool=FALSE;
 }
 
 void PlayListWidget::deletePlaylist() {
   switch( QMessageBox::information( this, (tr("Remove Playlist?")),
                                     (tr("You really want to delete\nthis playlist?")),
                                     (tr("Yes")), (tr("No")), 0 )){
   case 0: // Yes clicked,
     QFile().remove(playLists->selectedDocument().file());
     QFile().remove(playLists->selectedDocument().linkFile());
     playLists->reread();
@@ -858,129 +827,129 @@ void PlayListWidget::readPls( const QString &filename ) {
          } else { //if its a url
 //             if( name.right( 1 ).find( '/' ) == -1) {
 //                 s += "/";
 //             }
             lnk.setFile( s );
         }
         lnk.setType( "audio/x-mpegurl" );
 
         lnk.writeLink();
         d->selectedFiles->addToSelection( lnk );
     }
 
     m3uList->close();
     if(m3uList) delete m3uList;
 }
 
 /*
  writes current playlist to current m3u file */
 void PlayListWidget::writeCurrentM3u() {
   qDebug("writing to current m3u");
   Config cfg( "OpiePlayer" );
   cfg.setGroup("PlayList");
   QString currentPlaylist = cfg.readEntry("CurrentPlaylist","default");
 
   Om3u *m3uList;
   m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate );
   if( d->selectedFiles->first()) {
 
   do {
       qDebug( "add writeCurrentM3u " +d->selectedFiles->current()->file());
     m3uList->add( d->selectedFiles->current()->file() );
   }
   while ( d->selectedFiles->next() );
     qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" );
   m3uList->write();
   m3uList->close();
 
   if(m3uList) delete m3uList;
   }
   
 }
 
   /*
  writes current playlist to m3u file */
 void PlayListWidget::writem3u() {
     InputDialog *fileDlg;
     fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0);
     fileDlg->exec();
     QString name, filename, list;
     Om3u *m3uList;
 
     if( fileDlg->result() == 1 ) {
         name = fileDlg->text();
 //        qDebug( filename );
 
         if( name.left( 1) != "/" ) {
             filename = QPEApplication::documentDir() + "/" + name;
         }
 
         if( name.right( 3 ) != "m3u" ) {
             filename = QPEApplication::documentDir() + "/" +name+".m3u";
         }
 
         if( d->selectedFiles->first()) {
-        m3uList = new Om3u(filename, IO_ReadWrite);
+          m3uList = new Om3u(filename, IO_ReadWrite);
 
           do {
             m3uList->add( d->selectedFiles->current()->file());
           }
           while ( d->selectedFiles->next() );
           //    qDebug( list );
           m3uList->write();
           m3uList->close();
           if(m3uList) delete m3uList;
         
           if(fileDlg) delete fileDlg;
 
           DocLnk lnk;
           lnk.setFile( filename);
 //          lnk.setIcon("opieplayer2/playlist2");
           lnk.setName( name); //sets file name
 
           // qDebug(filename);
           Config config( "OpiePlayer" );
           config.setGroup( "PlayList" );
     
           config.writeEntry("CurrentPlaylist",filename);
           currentPlayList=filename;
 
           if(!lnk.writeLink()) {
             qDebug("Writing doclink did not work");
           }
 
           setCaption(tr("OpiePlayer: ") + name);
         }
     }
 }
 
 void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) {
   switch ( e->key() ) {
     ////////////////////////////// Zaurus keys
   case Key_F9: //activity
     //           if(audioUI->isHidden())
     //             audioUI->showMaximized();
     break;
   case Key_F10: //contacts
     //           if( videoUI->isHidden())
     //             videoUI->showMaximized();
     break;
   case Key_F11: //menu
     break;
   case Key_F12: //home
     //          doBlank();
     break;
   case Key_F13: //mail
     //           doUnblank();
     break;
   case Key_Q: //add to playlist
     addSelected();
     break;
   case Key_R: //remove from playlist
     removeSelected();
     break;
     //       case Key_P: //play
     //           qDebug("Play");
     //           playSelected();
     //           break;
   case Key_Space:
     //          playSelected(); puh