1 files changed, 35 insertions, 36 deletions

diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 70b7cef..2118051 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -618,33 +618,24 @@ void PlayListWidget::saveList() {
     QString filename;
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Save Playlist"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
      if ( d->current )
          delete d->current;
         filename = fileDlg->LineEdit1->text();//+".playlist";
 //         qDebug("saving playlist "+filename+".playlist");
         Config cfg( filename +".playlist");
         writeConfig( cfg );
 
-//             qDebug("same name so delete lnk??");
-//         if( playLists->selected()->name() == filename) {
-
-//             qDebug("same name so delete lnk");
-//             QFile().remove(playLists->selected()->file());
-//             QFile().remove(playLists->selected()->linkFile());
-//             playLists->reread();
-//         }
-//        qDebug("new doclnk");            
         DocLnk lnk;
 //        lnk.setComment( "");
         lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property
         lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D
         lnk.setIcon("opieplayer/playlist2");
         lnk.setName( filename); //sets file name
 //        qDebug(filename);
         if(!lnk.writeLink())
             qDebug("Writing doclink did not work");
       }
         Config config( "OpiePlayer" );
         config.writeEntry("CurrentPlaylist",filename);
@@ -838,35 +829,37 @@ void PlayListWidget::btnPlay(bool b) {
       case 0:
       {
           mediaPlayerState->setPlaying(b);
       }
       break;
       case 1:
       {
           addToSelection( audioView->selectedItem() );
           mediaPlayerState->setPlaying(b);
           d->selectedFiles->removeSelected( );
           tabWidget->setCurrentPage(1);
           d->selectedFiles->unSelect();
+          insanityBool=FALSE;         
 //          audioView->clearSelection();
       }
       break;
       case 2:
       {
           addToSelection( videoView->selectedItem() );
           mediaPlayerState->setPlaying(b);
           qApp->processEvents();
           d->selectedFiles->removeSelected( );
           tabWidget->setCurrentPage(2);
           d->selectedFiles->unSelect();
+          insanityBool=FALSE;
 //          videoView->clearSelection();
       }
       break;
     };
 }
 
 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->selected()->file());
@@ -890,25 +883,25 @@ void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint&
     m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
     m.insertSeparator();
     m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
     m.exec( QCursor::pos() );
       }
     break;
     };
 }
 
 void PlayListWidget::playSelected()
 {
     btnPlay( TRUE);
-    d->selectedFiles->unSelect();
+//    d->selectedFiles->unSelect();
 }
 
 void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const QPoint& point, int i)
 {
  switch (mouse) {
       case 1:
           
           break;
       case 2:{
     QPopupMenu  m;
     m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
     m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
@@ -1015,56 +1008,50 @@ void PlayListWidget::populateVideoView() {
             newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" ));
         }
     }
 }
 
 void PlayListWidget::openFile() {
     QString filename, name;
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         filename = fileDlg->LineEdit1->text();
-
-//         InputDialog *fileDlg2;
-//         fileDlg2 = new InputDialog(this,tr("Name"),TRUE, 0);
-//         fileDlg2->exec();
-//         if( fileDlg2->result() == 1 ) {
-//             name = fileDlg2->LineEdit1->text();
-//         }
 //http://205.188.234.129:8030
 // http://66.28.68.70:8000
         qDebug(filename);
-        DocLnk lnk;
-//     if(filename.left(7) == "http://")
-//         name=  filename.right(filename.length()-filename.find("http://")-7);
-//     else name = filename;
-//     qDebug("name is "+name);
-//     lnk.setComment(filename);
-        lnk.setName(filename); //sets file name
-        if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3")
-            filename += "/";
-        lnk.setFile(filename); //sets File property
-
-        lnk.setType("audio/x-mpegurl");
-        lnk.setExec("opieplayer");
-        lnk.setIcon("opieplayer/MPEGPlayer");
-
-        if(!lnk.writeLink()) 
-            qDebug("Writing doclink did not work");
-        d->selectedFiles->addToSelection(  lnk);
+        if(filename.right(3) == "m3u")
+            readm3u( filename);
+        else if(filename.right(3) == "pls")
+            readPls( filename);
+        else {
+            DocLnk lnk;
+
+            lnk.setName(filename); //sets file name
+            if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3")
+                filename += "/";
+            lnk.setFile(filename); //sets File property
+
+            lnk.setType("audio/x-mpegurl");
+            lnk.setExec("opieplayer");
+            lnk.setIcon("opieplayer/MPEGPlayer");
+
+            if(!lnk.writeLink()) 
+                qDebug("Writing doclink did not work");
+            d->selectedFiles->addToSelection(  lnk);
 //     if(fileDlg2)
 //         delete fileDlg2;
+        }
     }
-
     if(fileDlg)
         delete fileDlg;
 }
 
 void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
 {
     switch ( e->key() ) {
 ////////////////////////////// Zaurus keys
       case Key_F9: //activity
 //           if(audioUI->isHidden())
 //             audioUI->showMaximized();
           break;
@@ -1096,12 +1083,24 @@ void PlayListWidget::doBlank() {
 void PlayListWidget::doUnblank() {
       // this crashes opieplayer with a segfault
 //      int fd;
 //       fd=open("/dev/fb0",O_RDWR);
           qDebug("do unblanking");
        if (fd != -1) {
           ioctl(fd,FBIOBLANK,0);
           close(fd);
       }
        QCopEnvelope h("QPE/System", "setBacklight(int)");
        h <<-3;// v[1]; // -3 Force on
 }
+
+void PlayListWidget::readm3u(const QString &filename) {
+
+}
+
+void PlayListWidget::writem3u(const QString &filename) {
+
+}
+
+void PlayListWidget::readPls(const QString &filename) {
+
+}