- simplified addSelected

2 files changed, 24 insertions, 36 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 92da73b..c9ae225 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -473,167 +473,147 @@ bool PlayListWidget::next() {
  if ( mediaPlayerState->isUsingPlaylist() ) {
         if ( mediaPlayerState->isShuffled() ) {
             return prev();
         } else {
             if ( !d->selectedFiles->next() ) {
                 if ( mediaPlayerState->isLooping() ) {
                     return d->selectedFiles->first();
                 } else {
                     return FALSE;
                 }
             }
             return TRUE;
         }
     } else {
         return mediaPlayerState->isLooping();
     }
 }
 
 
 bool PlayListWidget::first() {
     if ( mediaPlayerState->isUsingPlaylist() )
         return d->selectedFiles->first();
     else
         return mediaPlayerState->isLooping();
 }
 
 
 bool PlayListWidget::last() {
     if ( mediaPlayerState->isUsingPlaylist() )
         return d->selectedFiles->last();
     else
         return mediaPlayerState->isLooping();
 }
 
 
  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());
         tabWidget->setCurrentPage(0);
     }
 }
 
 
 void PlayListWidget::setPlaylist( bool shown ) {
     if ( shown ) {
         d->playListFrame->show();
     } else {
         d->playListFrame->hide();
     }
 }
 
 
 void PlayListWidget::addSelected() {
-  qDebug("addSelected");
-  DocLnk lnk;
-  QString filename;
-  switch (whichList()) {
+  assert( inFileListMode() );
 
-  case 0: //playlist
-    return;
-    break;
-  case 1: { //audio
-    QListViewItemIterator it( audioView );
-    for ( ; it.current(); ++it ) {
+  QListView *fileListView = currentFileListView();
+  QListViewItemIterator it( fileListView );
+  for ( ; it.current(); ++it )
       if ( it.current()->isSelected() ) {
-        filename=it.current()->text(3);
-        lnk.setName( QFileInfo(filename).baseName() ); //sets name
-        lnk.setFile( filename ); //sets file name
-        d->selectedFiles->addToSelection(  lnk);
-        
-      }
-    }
-    audioView->clearSelection();    
-  }
-    break;
-    
-  case 2: { // video
-    QListViewItemIterator it( videoView );
-    for ( ; it.current(); ++it ) {
-      if ( it.current()->isSelected() ) {
-        filename=it.current()->text(3);
-        lnk.setName( QFileInfo(filename).baseName() ); //sets name
-        lnk.setFile( filename ); //sets file name
-        d->selectedFiles->addToSelection(  lnk);
+          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 );
       }
-    }
-    videoView->clearSelection();
-  }
-    break;
-  };
-  tabWidget->setCurrentPage(0);
-  writeCurrentM3u();          
+
+  fileListView->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) {
     switch ( whichList()) {
     case 0: //playlist
       return;
       break;
     };
     //      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 *) {
 
     switch ( whichList()) {
     case 0:
     {
         if( !tbDeletePlaylist->isHidden() )  {
             tbDeletePlaylist->hide();
         }
         d->tbRemoveFromList->setEnabled(TRUE);
         d->tbAddToList->setEnabled(FALSE);
     }
     break;
     case 1:
     {
       //        audioView->clear();
         if(!audioPopulated) populateAudioView();
 
         if( !tbDeletePlaylist->isHidden() ) {
             tbDeletePlaylist->hide();
         }
         d->tbRemoveFromList->setEnabled(FALSE);
         d->tbAddToList->setEnabled(TRUE);
@@ -738,128 +718,134 @@ void PlayListWidget::populateAudioView() {
         QListViewItem * newItem;
         if ( QFile( dit.current()->file()).exists() ||
              dit.current()->file().left(4) == "http" ) {
             long size;
             if( dit.current()->file().left(4) == "http" )
                 size=0;
             else
                 size = QFile( dit.current()->file() ).size();
             
             newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),
                                                    QString::number(size ), "" /*storage*/,
                                                    dit.current()->file() );
             newItem->setPixmap( 0, Resource::loadPixmap( "opieplayer2/musicfile" ) );
 //            qDebug("<<<< "+dit.current()->file());
        }
     }
     audioPopulated=true;
 }
 
 
 void PlayListWidget::populateVideoView() {
     videoView->clear();
     StorageInfo storageInfo;
     //    const QList<FileSystem> &fs = storageInfo.fileSystems();
 
     if(!videoScan ) {
         scanForVideo();
     }
 
     QListIterator<DocLnk> Vdit( vFiles.children() );
 //    QListIterator<FileSystem> it ( fs );
     videoView->clear();
     QString storage, pathName;
      for ( ; Vdit.current(); ++Vdit ) {
 //       //        for( ; it.current(); ++it ) {
 //             const QString name = (*Vdit)->name();
 //             const QString path = (*Vdit)->path();
 //             if( Vdit.current()->file().find(path) != -1 ) {
 //                 storage=name;
 //                 pathName=path;
 //                 //            }
 //         }
 
         QListViewItem * newItem;
         if ( QFile( Vdit.current()->file() ).exists() ) {
             newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(),
                    QString::number( QFile( Vdit.current()->file() ).size() ),
                                                    ""/*storage*/, Vdit.current()->file());
             newItem->setPixmap(0, Resource::loadPixmap( "opieplayer2/videofile" ) );
         }
     }
     videoPopulated=true;
 }
 
 QListView *PlayListWidget::currentFileListView() const
 {
     switch ( currentTab() ) {
         case AudioFiles: return audioView;
         case VideoFiles: return videoView;
         default: assert( false );
     }
     return 0;
 }
 
+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 {
             lnk.setName( QFileInfo(filename).baseName() ); //sets name
             lnk.setFile( filename ); //sets file name
             d->selectedFiles->addToSelection(  lnk);
             writeCurrentM3u();
             d->selectedFiles->setSelectedItem( lnk.name());
         }
     }
             
     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 );
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index a608eae..238a75c 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -31,96 +31,98 @@
 
 */
 
 #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, NumTabTypes = 4 };
 
     PlayListWidget( QWidget* parent=0, const char* name=0, WFlags fl=0 );
     ~PlayListWidget();
     DocLnkSet files;
     DocLnkSet vFiles;
     bool fromSetDocument;
     bool insanityBool;
     QString setDocFileRef, currentPlayList;
     // retrieve the current playlist entry (media file link)
     const DocLnk *current();
     void useSelectedDocument();
     int selected;
     int whichList() const;
     TabType currentTab() const;
 
 public slots:
     bool first();
     bool last();
     bool next();
     bool prev();
     void writeDefaultPlaylist( );
     QString currentFileListPathName() const;
 protected:
     void keyReleaseEvent( QKeyEvent *e);
 
 private:
     int defaultSkinIndex;
     bool audioScan, videoScan, audioPopulated, videoPopulated;
     void readm3u(const QString &);
     void readPls(const QString &);
     void initializeStates();
     void populateAudioView();
     void populateVideoView();
 
     QListView *currentFileListView() const;
 
+    bool inFileListMode() const;
+
 private slots:
     void populateSkinsMenu();
     void skinsMenuActivated(int);
     void pmViewActivated(int);
     void writem3u();
     void writeCurrentM3u();
     void scanForAudio();
     void scanForVideo();
     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 setPlaylist( bool ); // Show/Hide 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();
 };
 
 #endif // PLAY_LIST_WIDGET_H