1 files changed, 23 insertions, 14 deletions

diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 4926287..b9b63c7 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -1108,102 +1108,113 @@ void PlayListWidget::openFile() {
             }
         }
     }
     if(fileDlg)
         delete fileDlg;
 }
 
 void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
 {
     switch ( e->key() ) {
 ////////////////////////////// Zaurus keys
       case Key_F9: //activity
 //           if(audioUI->isHidden())
 //             audioUI->showMaximized();
           break;
       case Key_F10: //contacts
 //           if( videoUI->isHidden())
 //             videoUI->showMaximized();
           break;
       case Key_F11: //menu
           break;
       case Key_F12: //home
 //           doBlank();
           break;
       case Key_F13: //mail
 //           doUnblank();
           break;
       case Key_Q: //add to playlist
           qDebug("Add");
           addSelected();
           break;
       case Key_R: //remove from playlist
           removeSelected();
           break;
 //       case Key_P: //play
 //           qDebug("Play");
 //           playSelected();
 //           break;
       case Key_Space:
           qDebug("Play");
 //          playSelected(); puh
           break;
       case Key_1:
           tabWidget->setCurrentPage(0);
           break;
       case Key_2:
           tabWidget->setCurrentPage(1);
           break;
-      case Key_3:
-          tabWidget->setCurrentPage(2);
-          break;
-      case Key_4:
-          tabWidget->setCurrentPage(3);         
-          break;
+    case Key_3:
+      tabWidget->setCurrentPage(2);
+      break;
+    case Key_4:
+      tabWidget->setCurrentPage(3);         
+      break;
+    case Key_Down:
+      if ( !d->selectedFiles->next() )
+        d->selectedFiles->first();
+
+      break;
+    case Key_Up:
+      if ( !d->selectedFiles->prev() )
+        d->selectedFiles->last();
+
+      break;
+      
     }
 }
 
 void PlayListWidget::keyPressEvent( QKeyEvent *e)
 {
 //    qDebug("Key press");
 //     switch ( e->key() ) {
 // ////////////////////////////// Zaurus keys
 //       case Key_A: //add to playlist
 //           qDebug("Add");
 //           addSelected();
 //           break;
 //       case Key_R: //remove from playlist
 //           removeSelected();
 //           break;
 //       case Key_P: //play
 //           qDebug("Play");
 //           playSelected();
 //           break;
 //       case Key_Space:
 //           qDebug("Play");
 //           playSelected();
 //           break;
 //     }
 }
 
 void PlayListWidget::doBlank() {
     qDebug("do blanking");
     fd=open("/dev/fb0",O_RDWR);
     if (fd != -1) {
         ioctl(fd,FBIOBLANK,1);
 //            close(fd);
     }
 }
 
 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
 }
 
@@ -1291,67 +1302,65 @@ void PlayListWidget::writem3u() {
             filename=QPEApplication::documentDir()+"/"+filename;
         if(filename.right(3) != "m3u")
             filename=filename+".m3u";
         
         QFile f(filename);
         f.open(IO_WriteOnly);
         f.writeBlock(list, list.length());
         f.close();
     }
     if(fileDlg) delete fileDlg;
 }
 
 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
 // File1=http
 // Title
 // Length
 // Version
 // File2=http
              
                 s=s.replace( QRegExp("\\"),"/");
                 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);
 //             QFileInfo f(s);
 //             QString name = f.baseName();
 //             name = name.left(name.length()-4);
 //             name = name.right(name.findRev("/",0,TRUE));
                 lnk.setName( name);
-                if(s.at(s.length()-4) == '.')
-                    lnk.setFile( s);
-                else {
-                 if( name.right(1).find('/') == -1)
-                   s+="/";
-                   //                  if(s.right(1) != '/')
-                    lnk.setFile( s);
-
+                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");
 
                 qDebug("DocLnk add "+name);
                 d->selectedFiles->addToSelection( lnk);
             }
         }
         i++;
     }
 }