6 files changed, 102 insertions, 53 deletions

diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
index 9f8ba65..8ede537 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
@@ -29,12 +29,13 @@
 #include <errno.h>
 #include <time.h>
 #include <locale.h>
 #include <math.h>
 #include <assert.h>
 #include <qapplication.h>
+#include <qpe/config.h>
 
 //#define HAVE_MMAP
 
 #if defined(HAVE_MMAP)
 #   include <sys/mman.h>
 #endif
@@ -44,12 +45,13 @@
 extern "C" {
 #include "mad.h"
 }
 
 
 #define MPEG_BUFFER_SIZE    65536
+//#define MPEG_BUFFER_SIZE    32768 //16384 // 8192
 //#define debugMsg(a)     qDebug(a)
 #define debugMsg(a)
 
 
 class Input {
 public:
@@ -162,13 +164,16 @@ bool LibMadPlugin::isFileSupported( const QString& path ) {
     return FALSE;
 }
 
 
 bool LibMadPlugin::open( const QString& path ) {
     debugMsg( "LibMadPlugin::open" );
-
+    Config cfg("MediaPlayer");
+    cfg.setGroup("Options");
+    bufferSize = cfg.readNumEntry("MPeg_BufferSize",MPEG_BUFFER_SIZE);
+    qDebug("buffer size is %d", bufferSize);
     d->bad_last_frame = 0;
     d->flush = TRUE;
     info = QString( "" );
 
     //qDebug( "Opening %s", path.latin1() );
 
@@ -194,13 +199,13 @@ bool LibMadPlugin::open( const QString& path ) {
   }
   d->input.data = (unsigned char *)d->input.fdm;
     }
 #endif
 
     if (d->input.data == 0) {
-  d->input.data = (unsigned char *)malloc(MPEG_BUFFER_SIZE);
+        d->input.data = (unsigned char *)malloc( bufferSize /*MPEG_BUFFER_SIZE*/);
   if (d->input.data == 0) {
       qDebug("error allocating input buffer");
       return FALSE;
   }
   d->input.length = 0;
     }
@@ -366,24 +371,24 @@ bool LibMadPlugin::read() {
   if (d->stream.next_frame) {
     memmove(d->input.data, d->stream.next_frame,
     d->input.length = &d->input.data[d->input.length] - d->stream.next_frame);
   }
 
   do {
-    len = ::read(d->input.fd, d->input.data + d->input.length, MPEG_BUFFER_SIZE - d->input.length);
+    len = ::read(d->input.fd, d->input.data + d->input.length, bufferSize /* MPEG_BUFFER_SIZE*/ - d->input.length);
   }
   while (len == -1 && errno == EINTR);
 
   if (len == -1) {
     qDebug("error reading audio");
     return FALSE;
   }
   else if (len == 0) {
     d->input.eof = 1;
 
-    assert(MPEG_BUFFER_SIZE - d->input.length >= MAD_BUFFER_GUARD);
+    assert(bufferSize /*MPEG_BUFFER_SIZE*/ - d->input.length >= MAD_BUFFER_GUARD);
 
     while (len < MAD_BUFFER_GUARD)
       d->input.data[d->input.length + len++] = 0;
   }
 
   mad_stream_buffer(&d->stream, d->input.data, d->input.length += len);
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.h b/core/multimedia/opieplayer/libmad/libmadplugin.h
index b240b77..46cd4a1 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.h
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.h
@@ -100,11 +100,11 @@ public:
 
     long getPlayTime() { return -1; }
 
 private:
     LibMadPluginData *d;
     QString info;
-
+int bufferSize;
 };
 
 
 #endif
diff --git a/core/multimedia/opieplayer/libmpeg3/mpeg3io.c b/core/multimedia/opieplayer/libmpeg3/mpeg3io.c
index c5807a7..c5cae00 100644
--- a/core/multimedia/opieplayer/libmpeg3/mpeg3io.c
+++ b/core/multimedia/opieplayer/libmpeg3/mpeg3io.c
@@ -31,22 +31,22 @@ int mpeg3_copy_fs(mpeg3_fs_t *dst, mpeg3_fs_t *src)
         dst->current_byte = 0;
         return 0;
 }
 
 long mpeg3io_get_total_bytes(mpeg3_fs_t *fs)
 {
-/*
-         * struct stat st;
-         * if(stat(fs->path, &st) < 0) return 0;
-         * return (long)st.st_size;
- */
-
-        fseek(fs->fd, 0, SEEK_END);
-        fs->total_bytes = ftell(fs->fd);
-        fseek(fs->fd, 0, SEEK_SET);
-        return fs->total_bytes;
+
+  struct stat st;
+  if(stat(fs->path, &st) < 0) return 0;
+  return (long)st.st_size;
+
+
+/*  fseek(fs->fd, 0, SEEK_END); */
+/*  fs->total_bytes = ftell(fs->fd); */
+/*  fseek(fs->fd, 0, SEEK_SET); */
+/*  return fs->total_bytes; */
 }
 
 int mpeg3io_open_file(mpeg3_fs_t *fs)
 {
 /* Need to perform authentication before reading a single byte. */
         mpeg3_get_keys(fs->css, fs->path);
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp
index 6259b3f..8f3711a 100644
--- a/core/multimedia/opieplayer/playlistselection.cpp
+++ b/core/multimedia/opieplayer/playlistselection.cpp
@@ -16,12 +16,14 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
+#include <qpe/config.h>
+
 #include <qpainter.h>
 #include <qimage.h>
 #include <qheader.h>
 #include <qlistview.h>
 #include <qlist.h>
 #include <qpixmap.h>
@@ -47,13 +49,13 @@ private:
 };
 
 
 PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
     : QListView( parent, name )
 {
-    qDebug("starting playlistselector");
+//    qDebug("starting playlistselector");
 // #ifdef USE_PLAYLIST_BACKGROUND
 //    setStaticBackground( TRUE );
 //      setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) );
 
 //      setBackgroundPixmap( Resource::loadPixmap( "launcher/opielogo" ) );
 // #endif
@@ -182,6 +184,20 @@ bool PlayListSelection::last() {
 
 void PlayListSelection::unSelect()
 {
     QListViewItem *item = selectedItem();
     setSelected( currentItem(), FALSE);
 }
\ No newline at end of file
+
+void PlayListSelection::writeCurrent( Config& cfg ) {
+    cfg.setGroup("PlayList");
+    QListViewItem *item = selectedItem();
+    if ( item )
+        cfg.writeEntry("current", item->text(0) );
+    qDebug(item->text(0));
+
+}
+
+void  PlayListSelection::setSelectedItem(const QString &strk ) {
+//     setSelected( item, TRUE );
+//     ensureItemVisible( selectedItem() );
+}
diff --git a/core/multimedia/opieplayer/playlistselection.h b/core/multimedia/opieplayer/playlistselection.h
index ba37271..d10bc82 100644
--- a/core/multimedia/opieplayer/playlistselection.h
+++ b/core/multimedia/opieplayer/playlistselection.h
@@ -20,13 +20,13 @@
 #ifndef PLAY_LIST_SELECTION_H
 #define PLAY_LIST_SELECTION_H
 
 #include <qlist.h>
 #include <qlistview.h>
 #include <qpe/applnk.h>
-
+#include <qpe/config.h>
 
 class PlayListSelection : public QListView {
     Q_OBJECT
 public:
     PlayListSelection( QWidget *parent, const char *name=0 );
     ~PlayListSelection();
@@ -35,12 +35,14 @@ public:
 public slots:
     void addToSelection( const DocLnk & ); // Add a media file to the playlist
     void removeSelected();   // Remove a media file from the playlist
     void moveSelectedUp();   // Move the media file up the playlist so it is played earlier
     void moveSelectedDown(); // Move the media file down the playlist so it is played later
         void unSelect();
+  void writeCurrent( Config &);
+  void setSelectedItem( const QString & );
     bool prev();
     bool next();
     bool first();
     bool last();
 
 protected:
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 3b8f6d7..63df715 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -22,12 +22,13 @@
 
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/lnkproperties.h>
+#include <qpe/storage.h>
 
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
 #include <qaction.h>
@@ -213,12 +214,15 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     audioView->addColumn( tr("Title"),140);
     audioView->addColumn(tr("Size"), -1);
     audioView->addColumn(tr("Media"),-1);
     audioView->setColumnAlignment(1, Qt::AlignRight);
     audioView->setColumnAlignment(2, Qt::AlignRight);
     audioView->setAllColumnsShowFocus(TRUE);
+//     audioView->setMultiSelection( TRUE );
+//     audioView->setSelectionMode( QListView::Extended);
+    
     tabWidget->insertTab(aTab,tr("Audio"));
 
     QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold);
     connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
     
@@ -235,12 +239,15 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     videoView->addColumn(tr("Title"),140);
     videoView->addColumn(tr("Size"),-1);
     videoView->addColumn(tr("Media"),-1);
     videoView->setColumnAlignment(1, Qt::AlignRight);
     videoView->setColumnAlignment(2, Qt::AlignRight);
     videoView->setAllColumnsShowFocus(TRUE);
+//     videoView->setMultiSelection( TRUE );
+//     videoView->setSelectionMode( QListView::Extended);
+
     QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold);
     connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
 
     tabWidget->insertTab( vTab,tr("Video"));
 
@@ -315,37 +322,39 @@ void PlayListWidget::initializeStates() {
      d->selectedFiles->first();
 }
 
 
 void PlayListWidget::readConfig( Config& cfg ) {
     cfg.setGroup("PlayList");
-    
+    QString currentString = cfg.readEntry("current", "" );
     int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
-    
     for ( int i = 0; i < noOfFiles; i++ ) {
         QString entryName;
         entryName.sprintf( "File%i", i + 1 );
         QString linkFile = cfg.readEntry( entryName );
         DocLnk lnk( linkFile );
-        if ( lnk.isValid() )
+        if ( lnk.isValid() ) {
             d->selectedFiles->addToSelection( lnk );
     }
 }
+//    d->selectedFiles->setSelectedItem( (const QString &)currentString);
+}
 
 
 void PlayListWidget::writeConfig( Config& cfg ) const {
-    cfg.setGroup("PlayList");
 
+    d->selectedFiles->writeCurrent( cfg);
+    cfg.setGroup("PlayList");
     int noOfFiles = 0;
-
     d->selectedFiles->first();
     do {
   const DocLnk *lnk = d->selectedFiles->current();
   if ( lnk ) {
       QString entryName;
       entryName.sprintf( "File%i", noOfFiles + 1 );
+            qDebug(entryName);
       cfg.writeEntry( entryName, lnk->linkFile() );
       // if this link does exist, add it so we have the file
       // next time...
       if ( !QFile::exists( lnk->linkFile() ) ) {
     // the way writing lnks doesn't really check for out
     // of disk space, but check it anyway.
@@ -358,17 +367,15 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
                  "the next time you start it." )
              );
     }
       }      
        noOfFiles++;
   }
-    } while ( d->selectedFiles->next() );
-    
+    }
+    while ( d->selectedFiles->next() );
     cfg.writeEntry("NumberOfFiles", noOfFiles );
-
-   
 }
 
 
 void PlayListWidget::addToSelection( const DocLnk& lnk ) {
 //    qDebug("add");
     d->setDocumentUsed = FALSE;
@@ -383,33 +390,31 @@ void PlayListWidget::clearList() {
     while ( first() )
   d->selectedFiles->removeSelected();
 }
 
 
 void PlayListWidget::addAllToList() {
-    DocLnkSet files;
-    Global::findDocuments(&files, "video/*;audio/*");
-    QListIterator<DocLnk> dit( files.children() );
-    for ( ; dit.current(); ++dit )
-        d->selectedFiles->addToSelection( **dit );
+    DocLnkSet filesAll;
+    Global::findDocuments(&filesAll, "video/*;audio/*");
+    QListIterator<DocLnk> Adit( filesAll.children() );
+    for ( ; Adit.current(); ++Adit )
+        d->selectedFiles->addToSelection( **Adit );
 }
 
 
 void PlayListWidget::addAllMusicToList() {
-    DocLnkSet files;
-    Global::findDocuments(&files, "audio/*");
+//    DocLnkSet files;
+//    Global::findDocuments(&files, "audio/*");
     QListIterator<DocLnk> dit( files.children() );
     for ( ; dit.current(); ++dit )
         d->selectedFiles->addToSelection( **dit );
 }
 
 
 void PlayListWidget::addAllVideoToList() {
-    DocLnkSet files;
-    Global::findDocuments(&files, "video/*");
-    QListIterator<DocLnk> dit( files.children() );
+    QListIterator<DocLnk> dit( vFiles.children() );
     for ( ; dit.current(); ++dit )
         d->selectedFiles->addToSelection( **dit );
 }
 
 
 void PlayListWidget::setDocument(const QString& fileref) {
@@ -585,25 +590,29 @@ void PlayListWidget::saveList() {
     if ( d->current )
         delete d->current;
         filename = fileDlg->LineEdit1->text();//+".playlist";
 //        qDebug("saving playlist "+filename+".playlist");
         Config cfg( filename +".playlist");
         writeConfig( cfg );
-        if( playLists->selected()->name() == filename) {
-//            qDebug("same name so delete lnk");
-            QFile().remove(playLists->selected()->file());
-            QFile().remove(playLists->selected()->linkFile());
-            playLists->reread();
-        }
             
+//             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("mpegplayer/playlist2");
         lnk.setName( filename); //sets file name
+        qDebug(filename);
         if(!lnk.writeLink())
             qDebug("Writing doclink did not work");
       }
         Config config( "MediaPlayer" );
         config.writeEntry("CurrentPlaylist",filename);
         setCaption(tr("OpiePlayer: ")+filename);
@@ -618,17 +627,20 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
     if( name.length()>1) {
         setCaption("OpiePlayer: "+name);
 //    qDebug("load list "+ name+".playlist");
         clearList();
         Config cfg( name+".playlist");
         readConfig(cfg);
+
         tabWidget->setCurrentPage(0);
+
         Config config( "MediaPlayer" );
         config.writeEntry("CurrentPlaylist", name);
-        d->selectedFiles->first();
+//        d->selectedFiles->first();
     }
+    
 }
 
 void PlayListWidget::setPlaylist( bool shown ) {
     if ( shown ) 
   d->playListFrame->show();
     else
@@ -780,24 +792,26 @@ void PlayListWidget::btnPlay(bool b) {
       {
           addToSelection( audioView->selectedItem() );
           mediaPlayerState->setPlaying(b);
 //            qApp->processEvents();
           d->selectedFiles->removeSelected( );
           tabWidget->setCurrentPage(1);
-      d->selectedFiles->unSelect();
+           audioView->clearSelection();
+//      d->selectedFiles->unSelect();
 //            mediaPlayerState->setPlaying(FALSE);
       }
       break;
       case 2:
       {
           addToSelection( videoView->selectedItem() );
           mediaPlayerState->setPlaying(b);
           qApp->processEvents();
           d->selectedFiles->removeSelected( );
           tabWidget->setCurrentPage(2);
-      d->selectedFiles->unSelect();
+           videoView->clearSelection();
+//      d->selectedFiles->unSelect();
 //            mediaPlayerState->setPlaying(FALSE);
       }
       break;
     };
 }
 
@@ -902,39 +916,51 @@ void PlayListWidget::listDelete() {
     };
 }
 
 void PlayListWidget::populateAudioView() {
 //     if(files)
 //         files.~DocLnkSet();
+    StorageInfo storageInfo;
+    const QList<FileSystem> &fs = storageInfo.fileSystems();
+
     Global::findDocuments(&files, "audio/*");
     QListIterator<DocLnk> dit( files.children() );
+    QListIterator<FileSystem> it ( fs );
     audioView->clear();
     QString storage;
     for ( ; dit.current(); ++dit ) {
+        for( ; it.current(); ++it ){
+            const QString name = (*it)->name();
+            const QString path = (*it)->path();
+            if(dit.current()->file().find(path) != -1 ) storage=name;
+        }
+
         QListViewItem * newItem;
-        if(dit.current()->file().find("/mnt/cf") != -1 ) storage=tr("CF");
-        else if(dit.current()->file().find("/mnt/hda") != -1 ) storage=tr("CF");
-        else if(dit.current()->file().find("/mnt/card") != -1 ) storage=tr("SD");
-        else storage=tr("RAM");
         if ( QFile( dit.current()->file()).exists() ) {
             newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), QString::number( QFile( dit.current()->file()).size() ), storage);
             newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/musicfile" ));
         }
     }
 }
 
 void PlayListWidget::populateVideoView() {
+    StorageInfo storageInfo;
+    const QList<FileSystem> &fs = storageInfo.fileSystems();
+
     Global::findDocuments(&vFiles, "video/*");
     QListIterator<DocLnk> Vdit( vFiles.children() );
+    QListIterator<FileSystem> it ( fs );
     videoView->clear();
      QString storage;
     for ( ; Vdit.current(); ++Vdit ) {
-        if( Vdit.current()->file().find("/mnt/cf") != -1 ) storage=tr("CF");
-        else if( Vdit.current()->file().find("/mnt/hda") != -1 ) storage=tr("CF");
-        else if( Vdit.current()->file().find("/mnt/card") != -1 ) storage=tr("SD");
-        else storage=tr("RAM");
+        for( ; it.current(); ++it ){
+            const QString name = (*it)->name();
+            const QString path = (*it)->path();
+            if( Vdit.current()->file().find(path) != -1 ) storage=name;
+        }
+
         QListViewItem * newItem;
         if ( QFile( Vdit.current()->file()).exists() ) {
             newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), QString::number( QFile( Vdit.current()->file()).size() ), storage);
             newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/videofile" ));
         }
     }