3 files changed, 101 insertions, 102 deletions

diff --git a/noncore/multimedia/opieplayer2/om3u.cpp b/noncore/multimedia/opieplayer2/om3u.cpp
index 235d973..841d950 100644
--- a/noncore/multimedia/opieplayer2/om3u.cpp
+++ b/noncore/multimedia/opieplayer2/om3u.cpp
@@ -33,129 +33,130 @@
 #include "om3u.h"
 
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/storage.h>
 #include <qpe/mimetype.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
 
 #include <qdir.h>
 #include <qregexp.h>
 #include <qstring.h>
 #include <qtextstream.h>
 #include <qstringlist.h>
 #include <qcstring.h>
 
 //extern PlayListWidget *playList;
 
 Om3u::Om3u( const QString &filePath, int mode)
       : QStringList (){
 qDebug("<<<<<<<new m3u "+filePath);
   f.setName(filePath);
   f.open(mode);
 }
 
 Om3u::~Om3u(){}
 
 void Om3u::readM3u() {
 //    qDebug("<<<<<<reading m3u "+f.name());
     QTextStream t(&f);
     QString s;
     while ( !t.atEnd() ) {
         s=t.readLine();
 //                qDebug(s);
         if( s.find( "#", 0, TRUE) == -1 ) {
                 if( s.left(2) == "E:" || s.left(2) == "P:" ) {
                     s = s.right( s.length() -2 );
                     QFileInfo f( s );
                     QString name = f.baseName();
                     name = name.right( name.length() - name.findRev( "\\", -1, TRUE )  -1 );
                     s=s.replace( QRegExp( "\\" ), "/" );
                     append(s);
 //                    qDebug(s);
                 } else { // is url
                     s.replace( QRegExp( "%20" )," " );
                     QString name;
 //                     if( name.left( 4 ) == "http" ) {
 //                         name = s.right( s.length() - 7 );
 //                     } else {
                         name = s;
 //                     }
                     append(name);
 //                    qDebug(name);
                 }
         }
     }
 }
 
 void Om3u::readPls() { //it's a pls file
         QTextStream t( &f );
         QString s;
         while ( !t.atEnd() ) {
             s = t.readLine();
             if( s.left(4)  == "File" ) {
-                s = s.right( s.length() - 6 );
+                s = s.right( s.length() - s.find("=",0,true)-1 );
+                s = s.stripWhiteSpace();
                 s.replace( QRegExp( "%20" )," ");
 //                qDebug( "adding " + s + " to playlist" );
                 // numberofentries=2
                 // File1=http
                 // Title
                 // Length
                 // Version
                 // File2=http
                 s = s.replace( QRegExp( "\\" ), "/" );
                 QFileInfo f( s );
                 QString name = f.baseName();
                 if( name.left( 4 ) == "http" ) {
                     name = s.right( s.length() - 7);
                 }  else {
                     name = s;
                 }
                 name = name.right( name.length() - name.findRev( "\\", -1, TRUE) - 1 );
                 if( s.at( s.length() - 4) == '.') // if this is probably a file
                 append(s);
                 else { //if its a url
 //                     if( name.right( 1 ).find( '/' ) == -1) {
 //                         s += "/";
 //                     }
                     append(s);
                 }
             }
         }
 }
 
 void Om3u::write() { //writes list to m3u file
   QString list;
   if(count()>0) {
     for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
 //      qDebug(*it);
       list += *it+"\n";
     }
     f.writeBlock( list, list.length() );
   }
 //    f.close();
 }
 
 void Om3u::add(const QString &filePath) { //adds to m3u file
     append(filePath);
 }
 
 void Om3u::remove(const QString &filePath) { //removes from m3u list
   QString list, currentFile;
   if(count()>0) {
     for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
       currentFile=*it;
       //        qDebug(*it);
         
       if( filePath != currentFile)
         list += currentFile+"\n";
     }
     f.writeBlock( list, list.length() );
   }
 }
 
 void Om3u::deleteFile(const QString &/*filePath*/) {//deletes m3u file
      f.close();
      f.remove();
 
 }
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index a65495e..6e2457f 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -46,129 +46,129 @@
 
 #include "playlistselection.h"
 #include "playlistwidget.h"
 #include "mediaplayerstate.h"
 #include "inputDialog.h"
 #include "om3u.h"
 #include "playlistfileview.h"
 
 //only needed for the random play
 #include <stdlib.h>
 #include <assert.h>
 
 PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name )
     : PlayListWidgetGui( mediaPlayerState, parent, name ) , currentFileListView( 0 )
 {
 
     d->tbAddToList =  new ToolButton( bar, tr( "Add to Playlist" ),
                                       "opieplayer2/add_to_playlist",
                                       this , SLOT(addSelected() ) );
     d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ),
                                           "opieplayer2/remove_from_playlist",
                                           this , SLOT(removeSelected() ) );
     d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer2/play",
                                    this , SLOT( btnPlay( bool) ), TRUE );
     d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle",
                                    &mediaPlayerState, SLOT( setShuffled( bool ) ), TRUE );
     d->tbLoop    = new ToolButton( bar, tr( "Loop" ), "opieplayer2/loop",
                                    &mediaPlayerState, SLOT( setLooping( bool ) ), TRUE );
 
     (void)new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) );
     (void)new MenuItem( pmPlayList, tr( "Add all audio files" ),
                         this, SLOT( addAllMusicToList() ) );
     (void)new MenuItem( pmPlayList, tr( "Add all video files" ),
                         this, SLOT( addAllVideoToList() ) );
     (void)new MenuItem( pmPlayList, tr( "Add all files" ),
                         this, SLOT( addAllToList() ) );
     pmPlayList->insertSeparator(-1);
 //     (void)new MenuItem( pmPlayList, tr( "Save PlayList" ),
 //                         this, SLOT( saveList() ) );
     (void)new MenuItem( pmPlayList, tr( "Save Playlist" ),
                         this, SLOT(writem3u() ) );
     pmPlayList->insertSeparator(-1);
     (void)new MenuItem( pmPlayList, tr( "Open File or URL" ),
                         this,SLOT( openFile() ) );
     pmPlayList->insertSeparator(-1);
     (void)new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ),
                         audioView, SLOT( scanFiles() ) );
     (void)new MenuItem( pmPlayList, tr( "Rescan for Video Files" ),
                         videoView, SLOT( scanFiles() ) );
 
     pmView->insertItem(  Resource::loadPixmap("fullscreen") , tr( "Full Screen"),
                          &mediaPlayerState, SLOT( toggleFullscreen() ) );
 
     Config cfg( "OpiePlayer" );
     bool b= cfg.readBoolEntry("FullScreen", 0);
     mediaPlayerState.setFullscreen(  b );
     pmView->setItemChecked( -16, b );
 
     (void)new ToolButton( vbox1, tr( "Move Up" ), "opieplayer2/up",
                           d->selectedFiles, SLOT(moveSelectedUp() ) );
     (void)new ToolButton( vbox1, tr( "Remove" ), "opieplayer2/cut",
                           d->selectedFiles, SLOT(removeSelected() ) );
     (void)new ToolButton( vbox1, tr( "Move Down" ), "opieplayer2/down",
                           d->selectedFiles, SLOT(moveSelectedDown() ) );
-    QVBox *stretch2 = new QVBox( vbox1 );
+    //    QVBox *stretch2 = new QVBox( vbox1 );
 
     connect( tbDeletePlaylist, ( SIGNAL( released() ) ),
              SLOT( deletePlaylist() ) );
     connect( pmView, SIGNAL( activated( int ) ),
              this, SLOT( pmViewActivated( int ) ) );
     connect( skinsMenu, SIGNAL( activated( int ) ) ,
              this, SLOT( skinsMenuActivated( int ) ) );
     connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ),
              this,SLOT( playlistViewPressed( int, QListViewItem *, const QPoint&, int ) ) );
     connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int ) ),
              this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int ) ) );
     connect( audioView, SIGNAL( returnPressed( QListViewItem *) ),
              this,SLOT( playIt( QListViewItem *) ) );
     connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ),
              this, SLOT( addToSelection( QListViewItem *) ) );
     connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ),
              this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int) ) );
     connect( videoView, SIGNAL( returnPressed( QListViewItem *) ),
              this,SLOT( playIt( QListViewItem *) ) );
     connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ),
              this, SLOT( addToSelection( QListViewItem *) ) );
     connect( playLists, SIGNAL( fileSelected( const DocLnk &) ),
              this, SLOT( loadList( const DocLnk & ) ) );
     connect( tabWidget, SIGNAL ( currentChanged(QWidget*) ),
              this, SLOT( tabChanged( QWidget* ) ) );
     connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ),
              d->tbPlay,  SLOT( setOn( bool ) ) );
     connect( &mediaPlayerState, SIGNAL( loopingToggled( bool ) ),
              d->tbLoop, SLOT( setOn( bool ) ) );
     connect( &mediaPlayerState, SIGNAL( shuffledToggled( bool ) ),
              d->tbShuffle, SLOT( setOn( 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
     populateSkinsMenu();
     initializeStates();
 
     cfg.setGroup("PlayList");
     QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default");
     loadList(DocLnk(  currentPlaylist ) );
 
     tabWidget->showPage( playListTab );
 }
 
 
 PlayListWidget::~PlayListWidget() {
     delete d;
 }
 
 
 void PlayListWidget::initializeStates() {
     d->tbPlay->setOn( mediaPlayerState.isPlaying() );
     d->tbLoop->setOn( mediaPlayerState.isLooping() );
     d->tbShuffle->setOn( mediaPlayerState.isShuffled() );
     d->playListFrame->show();
 }
 
 void PlayListWidget::writeDefaultPlaylist() {
 
     Config config( "OpiePlayer" );
     config.setGroup( "PlayList" );
@@ -304,240 +304,243 @@ void PlayListWidget::addAllToList() {
 
 void PlayListWidget::addAllMusicToList() {
 
   audioView->populateView();
 
   QListViewItemIterator audioIt( audioView );
   DocLnk lnk;
   QString filename;
   // iterate through all items of the listview
   for ( ; audioIt.current(); ++audioIt ) {
     filename = audioIt.current()->text(3);
     lnk.setName( QFileInfo(filename).baseName() ); //sets name
     lnk.setFile( filename ); //sets file name
     d->selectedFiles->addToSelection(  lnk);
   }
 
     /*    if(!audioScan)
         scanForAudio();
     QListIterator<DocLnk> dit( files.children() );
     for ( ; dit.current(); ++dit ) {
         if( QFileInfo(dit.current()->file() ).exists() ) {
             d->selectedFiles->addToSelection( **dit );
         }
     }
     */
     tabWidget->setCurrentPage(0);
     writeCurrentM3u();
     d->selectedFiles->first();
 }
 
 
 void PlayListWidget::addAllVideoToList() {
 
   videoView->populateView();
 
   QListViewItemIterator videoIt( videoView );
   DocLnk lnk;
   QString filename;
   for ( ; videoIt.current(); ++videoIt ) {
     filename = videoIt.current()->text(3);
     lnk.setName( QFileInfo(filename).baseName() ); //sets name
     lnk.setFile( filename ); //sets file name
     d->selectedFiles->addToSelection(  lnk);
   }
 
 
   /*    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() ) {
+    QFileInfo fileInfo(fileref);
+    
+    if ( !fileInfo.exists() ) {
         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() );
+    QString extension = fileInfo.extension(false);
+
+    if( extension.find( "m3u", 0, false) != -1  
+       || extension.find( "pls", 0, false) != -1 ) {
+        readListFromFile( fileref );
     } else {
         clearList();
-        addToSelection( DocLnk( fileref ) );
+        DocLnk lnk;
+        lnk.setName( fileInfo.baseName() ); //sets name
+        lnk.setFile( fileref ); //sets file name
+        addToSelection( lnk );
         writeCurrentM3u();
 
         d->setDocumentUsed = TRUE;
         mediaPlayerState.setPlaying( FALSE );
         mediaPlayerState.setPlaying( TRUE );
     }
 }
 
 
 void PlayListWidget::useSelectedDocument() {
     d->setDocumentUsed = FALSE;
 }
 
 
 const DocLnk *PlayListWidget::current() const { // this is fugly
     assert( currentTab() == CurrentPlayList );
 
     const DocLnk *lnk = d->selectedFiles->current();
     if ( !lnk ) {
         d->selectedFiles->first();
         lnk = d->selectedFiles->current();
     }
     assert( lnk );
     return lnk;
 }
 
 
 bool PlayListWidget::prev() {
     if ( mediaPlayerState.isShuffled() ) {
         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() )
                 d->selectedFiles->first();
         }
         if ( cur == current() )
             if ( !d->selectedFiles->next() ) {
                 d->selectedFiles->first();
             }
         return TRUE;
     } else {
         if ( !d->selectedFiles->prev() ) {
             if ( mediaPlayerState.isLooping() ) {
                 return d->selectedFiles->last();
             } else {
                 return FALSE;
             }
         }
         return TRUE;
     }
 }
 
 
 bool PlayListWidget::next() {
 //qDebug("<<<<<<<<<<<<next()");
     if ( mediaPlayerState.isShuffled() ) {
         return prev();
     } else {
         if ( !d->selectedFiles->next() ) {
             if ( mediaPlayerState.isLooping() ) {
                 return d->selectedFiles->first();
             } else {
                 return FALSE;
             }
         }
         return TRUE;
     }
 }
 
 
 bool PlayListWidget::first() {
     return d->selectedFiles->first();
 }
 
 
 bool PlayListWidget::last() {
     return d->selectedFiles->last();
 }
 
 
  void PlayListWidget::saveList() {
    writem3u();
  }
 
 
 void PlayListWidget::loadList( const DocLnk & lnk) {
     QString name = lnk.name();
     //  qDebug("<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name);
 
     if( name.length()>0) {
         setCaption("OpiePlayer: "+name);
 //       qDebug("<<<<<<<<<<<<load list "+ lnk.file());
         clearList();
-        readm3u(lnk.file());
+//        readm3u(lnk.file());
+        readListFromFile(lnk.file());
         tabWidget->setCurrentPage(0);
     }
 }
 
 void PlayListWidget::addSelected() {
   assert( inFileListMode() );
 
   QListViewItemIterator it( currentFileListView );
   for ( ; it.current(); ++it )
       if ( it.current()->isSelected() ) {
           QString filename = it.current()->text(3);
 
           DocLnk lnk;
           lnk.setName( QFileInfo( filename ).baseName() ); //sets name
           lnk.setFile( filename ); //sets file name
 
           d->selectedFiles->addToSelection( lnk );
       }
 
   currentFileListView->clearSelection();
 
 //  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;
 
   if(it) {
     if ( currentTab() == CurrentPlayList )
         return;
     //      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 *) {
 
@@ -619,265 +622,259 @@ void PlayListWidget::btnPlay(bool b) {
 }
 
 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();
     break;
   case 1: // Cancel
     break;
   };
 }
 
 
 void PlayListWidget::playSelected() {
     btnPlay( TRUE);
 }
 
 bool PlayListWidget::inFileListMode() const
 {
     TabType tab = currentTab();
     return tab == AudioFiles || tab == VideoFiles;
 }
 
 void PlayListWidget::openFile() {
                 // http://66.28.164.33:2080
                 // http://somafm.com/star0242.m3u
     QString filename, name;
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         filename = fileDlg->text();
         qDebug( "Selected filename is " + filename );
         //            Om3u *m3uList;
             DocLnk lnk;
             Config cfg( "OpiePlayer" );
             cfg.setGroup("PlayList");
 
         if(filename.left(4) == "http") {
             QString m3uFile, m3uFilePath;
             if(filename.find(":",8,TRUE) != -1) { //found a port
                 m3uFile = filename.left( filename.find( ":",8,TRUE));
                 m3uFile = m3uFile.right(  7);
             } else if(filename.left(4) == "http"){
                 m3uFile=filename;
                 m3uFile = m3uFile.right( m3uFile.length() - 7);
             } else{
                 m3uFile=filename;
             }
 
 //            qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"+ m3uFile);
             lnk.setName( filename ); //sets name
             lnk.setFile( filename ); //sets file name
 
 //            lnk.setIcon("opieplayer2/musicfile");
 
             d->selectedFiles->addToSelection(  lnk );
             writeCurrentM3u();
             d->selectedFiles->setSelectedItem( lnk.name());
         }
-        else if( filename.right( 3) == "m3u" ) {
-            readm3u( filename );
-
-        } else if( filename.right(3) == "pls" ) {
-            readPls( filename );
+        else if( filename.right( 3) == "m3u" ||  filename.right(3) == "pls" ) {
+            readListFromFile( filename );
+//            readPls( filename );
         } else {
             lnk.setName( QFileInfo(filename).baseName() ); //sets name
             lnk.setFile( filename ); //sets file name
             d->selectedFiles->addToSelection(  lnk);
             writeCurrentM3u();
             d->selectedFiles->setSelectedItem( lnk.name());
         }
     }
 
+
     delete fileDlg;
 }
 
-/*
-reads m3u and shows files/urls to playlist widget */
-void PlayListWidget::readm3u( const QString &filename ) {
-    qDebug( "read m3u filename " + filename );
-
+void PlayListWidget::readListFromFile( const QString &filename ) {
+    qDebug( "read list filename " + filename );
+    QFileInfo fi(filename);
     Om3u *m3uList;
     QString s, name;
     m3uList = new Om3u( filename, IO_ReadOnly );
-    m3uList->readM3u();
+    if(fi.extension(false).find("m3u",0,false) != -1 )
+        m3uList->readM3u();
+    else if(fi.extension(false).find("pls",0,false) != -1 )
+        m3uList->readPls();
+
     DocLnk lnk;
     for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) {
         s = *it;
-//          qDebug("reading "+ s);
+        //        qDebug(s);
         if(s.left(4)=="http") {
           lnk.setName( s ); //sets file name
           lnk.setIcon("opieplayer2/musicfile");
           lnk.setFile( s ); //sets file name
 
-        }  else {
-          //               if( QFileInfo( s ).exists() ) {
+        }  else { //is file
           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(MimeType(s).pixmap() );
-//            lnk.setIcon("SoundPlayer");
           } else {
-            //            qDebug("set link2 "+s);
             lnk.setFile( s);
-//            lnk.setIcon(MimeType(s).pixmap() );
-//            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();
     delete m3uList;
 
     d->selectedFiles->setSelectedItem( s);
     setCaption(tr("OpiePlayer: ")+ QFileInfo(filename).baseName());
 
 }
 
-/*
-reads pls and adds files/urls to playlist  */
-void PlayListWidget::readPls( const QString &filename ) {
-
-    qDebug( "pls filename is " + filename );
-    Om3u *m3uList;
-    QString s, name;
-    m3uList = new Om3u( filename, IO_ReadOnly );
-    m3uList->readPls();
-
-    for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) {
-        s = *it;
-        //        s.replace( QRegExp( "%20" )," " );
-        DocLnk lnk( s );
-        QFileInfo f( s );
-        QString name = f.baseName();
-
-        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 );
-        if( s.at( s.length() - 4) == '.') {// if this is probably a file
-            lnk.setFile( s );
-         } 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();
-    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();
+// /*
+// reads pls and adds files/urls to playlist  */
+// void PlayListWidget::readPls( const QString &filename ) {
+
+//     qDebug( "pls filename is " + filename );
+//     Om3u *m3uList;
+//     QString s, name;
+//     m3uList = new Om3u( filename, IO_ReadOnly );
+//     m3uList->readPls();
+
+//     for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) {
+//         s = *it;
+//         //        s.replace( QRegExp( "%20" )," " );
+//         DocLnk lnk( s );
+//         QFileInfo f( s );
+//         QString name = f.baseName();
+
+//         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 );
+//         if( s.at( s.length() - 4) == '.') {// if this is probably a file
+//             lnk.setFile( s );
+//          } 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();
+//     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();
-  }
-  delete 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);
 
           do {
             m3uList->add( d->selectedFiles->current()->file());
           }
           while ( d->selectedFiles->next() );
           //    qDebug( list );
           m3uList->write();
           m3uList->close();
           delete m3uList;
 
           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;
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index e8bf211..cb65d5c 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -33,106 +33,107 @@
 
 #ifndef PLAY_LIST_WIDGET_H
 #define PLAY_LIST_WIDGET_H
 
 #include <qmainwindow.h>
 #include <qpe/applnk.h>
 #include <qtabwidget.h>
 #include <qpe/fileselector.h>
 #include <qpushbutton.h>
 #include <qpopupmenu.h>
 
 #include "playlistwidgetgui.h"
 
 
 //class PlayListWidgetPrivate;
 class Config;
 class QListViewItem;
 class QListView;
 class QPoint;
 class QAction;
 class QLabel;
 
 class PlayListWidget : public PlayListWidgetGui {
     Q_OBJECT
 public:
     enum TabType { CurrentPlayList, AudioFiles, VideoFiles, PlayLists };
     enum { TabTypeCount = 4 };
 
     struct Entry
     {
         Entry( const QString &_name, const QString &_fileName )
             : name( _name ), file( _fileName ) {}
         Entry( const QString &_fileName )
             : name( _fileName ), file( _fileName ) {}
 
         QString name;
         QString file;
     };
 
     PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
     ~PlayListWidget();
 
     // retrieve the current playlist entry (media file link)
     const DocLnk *current() const;
     void useSelectedDocument();
     TabType currentTab() const;
 
     Entry currentEntry() const;
 
 public slots:
     bool first();
     bool last();
     bool next();
     bool prev();
     void writeDefaultPlaylist( );
     QString currentFileListPathName() const;
 protected:
     void keyReleaseEvent( QKeyEvent *e);
 
 signals:
     void skinSelected();
 
 private:
     int defaultSkinIndex;
-    void readm3u(const QString &);
-    void readPls(const QString &);
+/*     void readm3u(const QString &); */
+/*     void readPls(const QString &); */
+    void readListFromFile(const QString &);
     void initializeStates();
 
     bool inFileListMode() const;
 
 private slots:
     void populateSkinsMenu();
     void skinsMenuActivated(int);
     void pmViewActivated(int);
     void writem3u();
     void writeCurrentM3u();
     void openFile();
     void setDocument( 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 clearList();
     void addAllToList();
     void addAllMusicToList();
     void addAllVideoToList();
     void saveList();  // Save the playlist
     void loadList( const DocLnk &);  // Load a playlist
     void playIt( QListViewItem *);
     void btnPlay(bool);
     void deletePlaylist();
     void addSelected();
     void removeSelected();
     void tabChanged(QWidget*);
     void viewPressed( int, QListViewItem *, const QPoint&, int);
     void playlistViewPressed( int, QListViewItem *, const QPoint&, int);
     void playSelected();
 
 private:
     bool fromSetDocument;
     bool insanityBool;
     QString setDocFileRef, currentPlayList;
     int selected;
     QListView *currentFileListView;
 };
 
 #endif // PLAY_LIST_WIDGET_H