3 files changed, 64 insertions, 47 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index b8023ca..043d8ba 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -152,17 +152,16 @@ void MediaPlayer::next() {
         }
     } else { //if playing from file list, let's just stop
         odebug << "<<<<<<<<<<<<<<<<<stop for filelists" << oendl;
         mediaPlayerState.setPlaying(false);
         mediaPlayerState.setDisplayType( MediaPlayerState::MediaSelection );
         if(l) mediaPlayerState.setLooping(l);
         if(r) mediaPlayerState.setShuffled(r);
     }
-    qApp->processEvents();
 }
 
 
 void MediaPlayer::startDecreasingVolume() {
     volumeDirection = -1;
     startTimer( 100 );
     volControl->decVol(2);
 }
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 37b998f..dc2c496 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -80,16 +80,18 @@ PlayListWidget::PlayListWidget(QWidget* parent, const char* name, WFlags fl )
                         this, SLOT( addAllVideoToList() ) );
     (void)new MenuItem( pmPlayList, tr( "Add all files" ),
                         this, SLOT( addAllToList() ) );
     pmPlayList->insertSeparator(-1);
     (void)new MenuItem( pmPlayList, tr( "Add File" ),
                         this,SLOT( openFile() ) );
     (void)new MenuItem( pmPlayList, tr("Add URL"),
                         this,SLOT( openURL() ) );
+    (void)new MenuItem( pmPlayList, tr( "Add Directory"),
+                        this, SLOT(openDirectory()));
     pmPlayList->insertSeparator(-1);
     (void)new MenuItem( pmPlayList, tr( "Save Playlist" ),
                         this, SLOT(writem3u() ) );
     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() ) );
@@ -657,66 +659,87 @@ void PlayListWidget::openURL() {
         }
     }
 
 
     delete fileDlg;
 }
 
 
-void PlayListWidget::openFile() {
-
-    QString filename, name;
-
-    Config cfg( "OpiePlayer" );
-    cfg.setGroup("Dialog");
+static MimeTypes fileSelectorMimeTypes() {
     MimeTypes types;
     QStringList audio, video, all;
     audio << "audio/*";
     audio << "playlist/plain";
     audio << "audio/x-ogg";
     audio << "audio/x-mpegurl";
 
     video << "video/*";
     video << "playlist/plain";
 
     all += audio;
     all += video;
     types.insert("All Media Files", all );
     types.insert("Audio",  audio );
     types.insert("Video", video );
 
-    QString str = OFileDialog::getOpenFileName( 1,
-                                                cfg.readEntry("LastDirectory",QPEApplication::documentDir()),"",
-                                                types, 0 );
+    return types;
+}
+
+void PlayListWidget::openFile() {
+
+    QString filename, name;
+
+    Config cfg( "OpiePlayer" );
+    cfg.setGroup("Dialog");
+    MimeTypes types = fileSelectorMimeTypes();
+
+
+    QString str = OFileDialog::getOpenFileName( 1, QString::null,
+                                                QString::null, types, 0,
+                                                tr("Add File to Playlist") );
+
+    if( str.isEmpty() )
+        return;
+
+    if(str.left(2) == "//") str=str.right(str.length()-1);
+
 
-    if(str.left(2) == "//")  {
-        str=str.right(str.length()-1);
+    if( str.right( 3) == "m3u" ||  str.right(3) == "pls" ) {
+        readListFromFile( str );
+    } else {
+        QFileInfo info( str );
+        DocLnk lnk = addFileToPlaylist( str, info.baseName() );
+        d->selectedFiles->setSelectedItem( lnk.name() );
     }
-    cfg.writeEntry( "LastDirectory" ,QFileInfo( str ).dirPath() );
+}
 
-    if( !str.isEmpty() ) {
+void PlayListWidget::openDirectory() {
+    QString str = OFileDialog::getDirectory( OFileSelector::DirectorySelector,
+                                             QString::null, 0,
+                                             tr( "Add Files from Directory"));
 
-        odebug << "Selected filename is " + str << oendl;
-        filename = str;
-        DocLnk lnk;
+    if(str.isEmpty() )
+        return;
+
+    if(str.left(2) == "//") str=str.right(str.length()-1);
+    QDir dir( str );
+    QStringList lst = dir.entryList(QDir::Files|QDir::Readable);
 
-        if( filename.right( 3) == "m3u" ||  filename.right(3) == "pls" ) {
+    for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
+        QString filename = str + "/" + *it;
+
+        if( filename.right( 3) == "m3u" ||  filename.right(3) == "pls" )
             readListFromFile( 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() );
+        else {
+            addFileToPlaylist( filename, QFileInfo(*it).baseName() );
         }
     }
 }
 
-
 void PlayListWidget::readListFromFile( const QString &filename ) {
     odebug << "read list filename " + filename << oendl;
     QFileInfo fi(filename);
     Om3u *m3uList;
     QString s, name;
     m3uList = new Om3u( filename, IO_ReadOnly );
     if(fi.extension(false).find("m3u",0,false) != -1 )
         m3uList->readM3u();
@@ -780,43 +803,26 @@ void PlayListWidget::readListFromFile( const QString &filename ) {
    }
    delete m3uList;
 
  }
 
   /*
  writes current playlist to m3u file */
 void PlayListWidget::writem3u() {
-    //InputDilog *fileDlg;
-    //fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0);
-    //fileDlg->exec();
 
     Config cfg( "OpiePlayer" );
     cfg.setGroup("Dialog");
-    MimeTypes types;
-    QStringList audio, video, all;
-    audio << "audio/*";
-    audio << "playlist/plain";
-    audio << "audio/x-mpegurl";
+    MimeTypes types = fileSelectorMimeTypes();
 
-    video << "video/*";
-    video << "playlist/plain";
+    QString str = OFileDialog::getOpenFileName( 1, QString::null,
+                                                QString::null, types, 0,
+                                                tr( "Save Playlist" ));
 
-    all += audio;
-    all += video;
-    types.insert("All Media Files", all );
-    types.insert("Audio",  audio );
-    types.insert("Video", video );
-
-    QString str = OFileDialog::getOpenFileName( 1,
-                  cfg.readEntry("LastDirectory",QPEApplication::documentDir()),"",
-                  types, 0 );
     if(str.left(2) == "//") str=str.right(str.length()-1);
-    cfg.writeEntry("LastDirectory" ,QFileInfo(str).dirPath());
-
 
     QString name, filename, list;
     Om3u *m3uList;
 
     if( !str.isEmpty() ) {
         name = str;
         //       name = fileDlg->text();
 //        odebug << filename << oendl;
@@ -1002,17 +1008,16 @@ PlayListWidget::Entry PlayListWidget::currentEntry() const
 }
 
 QString PlayListWidget::currentFileListPathName() const {
     return currentFileListView->currentItem()->text( 3 );
 }
 
 
 void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) {
-   odebug << "qcop message "+msg << oendl;
    QDataStream stream ( data, IO_ReadOnly );
    if ( msg == "play()" ) { //plays current selection
       btnPlay( true);
    } else if ( msg == "stop()" ) {
       mediaPlayerState->setPlaying( false);
    } else if ( msg == "togglePause()" ) {
       mediaPlayerState->togglePaused();
    } else if ( msg == "next()" ) { //select next in list
@@ -1043,8 +1048,19 @@ void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) {
       addToSelection( lnk );
    } else if ( msg == "rem(QString)" ) { //remove from playlist
       QString file;
       stream >> file;
 
    }
 
 }
+
+DocLnk PlayListWidget::addFileToPlaylist( const QString& file,
+                                        const QString& name ) {
+    DocLnk lnk;
+    lnk.setName( name ); //sets name
+    lnk.setFile( file ); //sets file name
+    d->selectedFiles->addToSelection(  lnk );
+    writeCurrentM3u();
+
+    return lnk;
+}
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index 29f3e8d..1f5ba92 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -105,16 +105,17 @@ private slots:
     void qcopReceive(const QCString&, const QByteArray&);
     void populateSkinsMenu();
     void skinsMenuActivated(int);
     void pmViewActivated(int);
     void writem3u();
     void writeCurrentM3u();
     void openFile();
     void openURL();
+    void openDirectory();
     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
@@ -125,16 +126,17 @@ private slots:
     void addSelected();
     void removeSelected();
     void tabChanged(QWidget*);
     void viewPressed( int, QListViewItem *, const QPoint&, int);
     void playlistViewPressed( int, QListViewItem *, const QPoint&, int);
     void playSelected();
 
 private:
+    DocLnk addFileToPlaylist(const QString& directory, const QString& name);
     bool fromSetDocument;
     bool insanityBool;
     QString setDocFileRef, currentPlayList;
     int selected;
     QListView *currentFileListView;
 
     MediaPlayer *m_mp;
 };