no extras here either

1 files changed, 5 insertions, 3 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 75c7332..b15f95e 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -436,84 +436,86 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
 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();          
+    
       }
           break;
     };
 }
 
 
 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;
 
     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 );
                   }
@@ -745,67 +747,67 @@ void PlayListWidget::openFile() {
         else if( filename.right( 3) == "m3u" ) {
             readm3u( filename );
 
         } else if( filename.right(3) == "pls" ) {
             readPls( filename );
         } else {
             d->selectedFiles->addToSelection(  DocLnk(filename) );
             writeCurrentM3u();
         }
     }
             
     if( fileDlg ) {
         delete fileDlg;
     }
 }
 
 /*
 reads m3u and shows files/urls to playlist widget */
 void PlayListWidget::readm3u( const QString &filename ) { 
     qDebug( "read m3u filename " + filename );
 
     Om3u *m3uList;
     QString s, name;
     m3uList = new Om3u( filename, IO_ReadOnly );
     m3uList->readM3u();
     DocLnk lnk;
     for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) {
         s = *it;
 //          qDebug("reading "+ s);
         if(s.left(4)=="http") {
           lnk.setName( s ); //sets file name
           lnk.setIcon("opieplayer2/musicfile");
-          if(s.right(4) != '.' || s.right(5) != '.')
-            lnk.setFile( s+"/"); //if url with no extension
-          else
+//           if(s.right(4) != '.' || s.right(5) != '.')
+//             lnk.setFile( s+"/"); //if url with no extension
+//           else
             lnk.setFile( s ); //sets file name
             
         }  else {
           //               if( QFileInfo( s ).exists() ) {
           lnk.setName( QFileInfo(s).baseName());
           //                 if(s.right(4) == '.')   {//if regular file
           if(s.left(1) != "/")  { 
             //            qDebug("set link "+QFileInfo(filename).dirPath()+"/"+s);
             lnk.setFile( QFileInfo(filename).dirPath()+"/"+s);
             lnk.setIcon("SoundPlayer");
           } else {
             //            qDebug("set link2 "+s);
             lnk.setFile( s);
             lnk.setIcon("SoundPlayer");
           }
         }
         d->selectedFiles->addToSelection( lnk );
     }
     Config config( "OpiePlayer" );
     config.setGroup( "PlayList" );
 
     config.writeEntry("CurrentPlaylist",filename);
     config.write();
     currentPlayList=filename;
 
 //    m3uList->write();
     m3uList->close();
     if(m3uList) delete m3uList;
 
     d->selectedFiles->setSelectedItem( s);
     setCaption(tr("OpiePlayer: ")+ QFileInfo(filename).baseName());