1 files changed, 13 insertions, 3 deletions

diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 2323ac2..eeaed33 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -824,65 +824,66 @@ void PlayListWidget::tabChanged(QWidget *widg) {
               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(b);
     switch ( tabWidget->currentPageIndex()) {
       case 0:
       {
           qDebug("here we are");
-          if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1 || d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) {
+          if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1
+              || d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) {
               QMessageBox::message("Note","You are trying to play\na malformed url.");
         
           } else { 
 
               mediaPlayerState->setPlaying(b);
           }      }
       break;
       case 1:
       {
               addToSelection( audioView->currentItem() );
               mediaPlayerState->setPlaying(b);
               d->selectedFiles->removeSelected( );
               tabWidget->setCurrentPage(1);
               d->selectedFiles->unSelect();
               insanityBool=FALSE;         
           }//          audioView->clearSelection();
       break;
       case 2:
       {
               addToSelection( videoView->currentItem() );
               mediaPlayerState->setPlaying(b);
               qApp->processEvents();
               d->selectedFiles->removeSelected( );
               tabWidget->setCurrentPage(2);
               d->selectedFiles->unSelect();
               insanityBool=FALSE;
           }//          videoView->clearSelection();
       break;
     };
  
 }
 
@@ -1204,78 +1205,87 @@ void PlayListWidget::doUnblank() {
           close(fd);
       }
        QCopEnvelope h("QPE/System", "setBacklight(int)");
        h <<-3;// v[1]; // -3 Force on
 }
 
 void PlayListWidget::readm3u(const QString &filename) {
 
     qDebug("m3u filename is "+filename);
     QFile f(filename);
 
     if(f.open(IO_ReadOnly)) {
         QTextStream t(&f);
         QString s;//, first, second;
         int i=0;
         while ( !t.atEnd()) {
 //        Lview->insertLine(t.readLine(),-1);
             s=t.readLine();
         if(s.find(" ",0,TRUE) != -1 || s.find("%20",0,TRUE) != -1) {
         QMessageBox::message("Note","Spaces in urls are not allowed.");
         } 
            else if(s.find("#",0,TRUE) == -1) {
                  if(s.find(" ",0,TRUE) == -1)  { // not sure if this is neede since cf uses vfat
                     if(s.left(2) == "E:" || s.left(2) == "P:") {
                         s=s.right(s.length()-2);
                         DocLnk lnk( s );
                         QFileInfo f(s);
                         QString name = f.baseName();
                         name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1);
                         lnk.setName( name);
                         s=s.replace( QRegExp("\\"),"/");
                         lnk.setFile( s);
+                        lnk.writeLink();
 //                         lnk.setIcon(opieplayer/MPEGPlayer);
                         qDebug("add "+name);
                          d->selectedFiles->addToSelection( lnk);
                     } else { // is url
 
                         s.replace(QRegExp("%20")," ");
                          DocLnk lnk( s);
-                         QString name = s.right( s.length() - 7);
+                          QString name;
+                         if(name.left(4)=="http")
+                             name = s.right( s.length() - 7);
+                         else
+                             name=s;
 //                         name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1);
                          lnk.setName(name);
-                         lnk.setFile( s+"/");
+                         if(s.at(s.length()-4) == '.')
+                             lnk.setFile( s);
+                         else
+                             lnk.setFile( s+"/");
 //                         lnk.setFile( filename);
 //                         lnk.setComment( s+"/");
                          lnk.setType("audio/x-mpegurl");
+                        lnk.writeLink();
 //                          lnk.setIcon( "opieplayer/MPEGPlayer");
 //                          qDebug("add "+s);
                        d->selectedFiles->addToSelection( lnk);
                     }
                     i++;
                  }
             }
         }
     }
     f.close();
 }
 
 void PlayListWidget::writem3u(const QString &filename) {
 
 }
 
 void PlayListWidget::readPls(const QString &filename) {
 
     qDebug("pls filename is "+filename);
     QFile f(filename);
 
     if(f.open(IO_ReadOnly)) {
         QTextStream t(&f);
         QString s;//, first, second;
         int i=0;
          while ( !t.atEnd()) {
              s=t.readLine();
              if(s.left(4) == "File") {
                  s=s.right(s.length() - 6);
                  s.replace(QRegExp("%20")," ");
                  qDebug("adding "+s+" to playlist");
 // numberofentries=2