1 files changed, 36 insertions, 67 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
@@ -211,4 +211,5 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) {
         if( QFileInfo( lnk.file() ).exists() ||
-            lnk.file().left(4) == "http" )
+            lnk.file().left(4) == "http" ) {
             d->selectedFiles->addToSelection( lnk );
+        }
 //          writeCurrentM3u();          
@@ -267,3 +268,6 @@ void PlayListWidget::addAllToList() {
     }
+    tabWidget->setCurrentPage(0);
+    
     writeCurrentM3u();          
+    d->selectedFiles->first();
 }
@@ -280,3 +284,5 @@ void PlayListWidget::addAllMusicToList() {
     }
+    tabWidget->setCurrentPage(0);
     writeCurrentM3u();          
+    d->selectedFiles->first();
 }
@@ -293,3 +299,5 @@ void PlayListWidget::addAllVideoToList() {
     }
+    tabWidget->setCurrentPage(0);
     writeCurrentM3u();          
+    d->selectedFiles->first();
 }
@@ -425,3 +433,3 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
     QString name = lnk.name();
-  qDebug("<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name);
+    //  qDebug("<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name);
 
@@ -429,3 +437,3 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
         setCaption("OpiePlayer: "+name);
-       qDebug("<<<<<<<<<<<<load list "+ lnk.file());
+//       qDebug("<<<<<<<<<<<<load list "+ lnk.file());
         clearList();
@@ -448,44 +456,18 @@ void PlayListWidget::addSelected() {
     qDebug("addSelected");
+  DocLnk lnk;
+  QString filename;
     switch (whichList()) {
+
       case 0: //playlist
+    return;
           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();
+    filename=audioView->currentItem()->text(3);
+    //    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);
-                        }
-                      }
-                  }
-              }
-          }
+    filename=videoView->currentItem()->text(3);
 //          tabWidget->setCurrentPage(0);
-          writeCurrentM3u();          
     
@@ -494,2 +476,7 @@ void PlayListWidget::addSelected() {
     };
+  lnk.setName( QFileInfo(filename).baseName() ); //sets name
+  lnk.setFile( filename ); //sets file name
+  d->selectedFiles->addToSelection(  lnk);
+  tabWidget->setCurrentPage(0);
+  writeCurrentM3u();          
 }
@@ -516,34 +503,16 @@ void PlayListWidget::addToSelection( QListViewItem *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:
+    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);