committed by ljp: fixed a problem opening files from docs tab being added to playlist.

fixed (hopefully) problem with player redraw when playing wavfiles

2 files changed, 4 insertions, 7 deletions

diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 1a0c7ca..a6202bc 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -373,106 +373,103 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
 void PlayListWidget::addToSelection( const DocLnk& lnk ) {
     qDebug("add");
     d->setDocumentUsed = FALSE;
     if ( mediaPlayerState->playlist() )
         d->selectedFiles->addToSelection( lnk );
     else
   mediaPlayerState->setPlaying( TRUE );
 }
 
 
 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 );
 }
 
 
 void PlayListWidget::addAllMusicToList() {
     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() );
     for ( ; dit.current(); ++dit )
         d->selectedFiles->addToSelection( **dit );
 }
 
 
 void PlayListWidget::setDocument(const QString& fileref) {
     if ( fileref.isNull() ) {
         QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) );
         return;
     }
-    if ( mediaPlayerState->playlist() )
         addToSelection( DocLnk( fileref ) );
-    else {
         d->setDocumentUsed = TRUE;
-        if ( d->current )
-            delete d->current;
-        d->current = new DocLnk( fileref );
-    }
+    qApp->processEvents();
     mediaPlayerState->setPlaying( FALSE );
+    qApp->processEvents();
     mediaPlayerState->setPlaying( TRUE );
+    d->selectedFiles->removeSelected( );
 }
 
 
 void PlayListWidget::setActiveWindow() {
     // When we get raised we need to ensure that it switches views
     char origView = mediaPlayerState->view();
     mediaPlayerState->setView( 'l' ); // invalidate
     mediaPlayerState->setView( origView ); // now switch back
 }
 
 
 void PlayListWidget::useSelectedDocument() {
     d->setDocumentUsed = FALSE;
 }
 
 
 const DocLnk *PlayListWidget::current() {
 
 //    qDebug("in Playlist  widget ::current");
     if ( mediaPlayerState->playlist() ) {
  return d->selectedFiles->current();
     }
     else if ( d->setDocumentUsed && d->current ) {
  return d->current;
     } else {
  return d->files->selected();
     }
 }
 
 
 bool PlayListWidget::prev() {
     if ( mediaPlayerState->playlist() ) {
   if ( mediaPlayerState->shuffled() ) {
       const DocLnk *cur = current();
       int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
       for ( int i = 0; i < j; i++ ) {
     if ( !d->selectedFiles->next() )
         d->selectedFiles->first();
       }
       if ( cur == current() )
     if ( !d->selectedFiles->next() )
         d->selectedFiles->first();
       return TRUE;
   } else {
       if ( !d->selectedFiles->prev() ) {
     if ( mediaPlayerState->looping() ) {
         return d->selectedFiles->last();
     } else {
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.cpp b/core/multimedia/opieplayer/wavplugin/wavplugin.cpp
index 4a0da16..4e82900 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.cpp
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.cpp
@@ -29,97 +29,96 @@
 
 //#define debugMsg(a)     qDebug(a)
 #define debugMsg(a)
 
 
 struct RiffChunk {
     char id[4];
     Q_UINT32 size;
     char data[4];
 };
 
 
 struct ChunkData {
     Q_INT16 formatTag;
     Q_INT16 channels;
     Q_INT32 samplesPerSec;
     Q_INT32 avgBytesPerSec;
     Q_INT16 blockAlign;
     Q_INT16 wBitsPerSample;
 };
 
 
 const int sound_buffer_size = 512; // 4096; // you got to be kidding right?
 
 
 class WavPluginData {
 public:
     QFile *input;
 
     int wavedata_remaining;
     ChunkData chunkdata;
     RiffChunk chunk;
     uchar data[sound_buffer_size+32]; // +32 to handle badly aligned input data
     int out,max;
     int samples_due;
     int samples;
 
     WavPluginData() {
   max = out = sound_buffer_size;
   wavedata_remaining = 0;
   samples_due = 0;
   samples = -1;
     }
 
     // expands out samples to the frequency of 44kHz //not any more
     bool add( short *output, long count, long& done, bool stereo )
     {
   done = 0;
-    qApp->processEvents();
 
   if ( input == 0 ) {
       qDebug("no input");
       return FALSE;
   }
 
         while ( count ) {
             int l,r;
             if ( getSample(l, r) == FALSE ) {
                 qDebug("didn't get sample");
                 return FALSE;
             }
               samples_due += chunkdata.samplesPerSec;
               printf("samples due %d\r", samples_due);
               fflush(stdout);
              while ( count && (samples_due > chunkdata.samplesPerSec) ) {
                 *output++ = l;
                 if ( stereo )
                     *output++ = r;
                 samples_due -= chunkdata.samplesPerSec;
                 count--;
                 done++;
             }
         }
         return TRUE;
     }
 
     bool initialise() {
   if ( input == 0 )
       return FALSE;
 
   wavedata_remaining = -1;
 
   while ( wavedata_remaining == -1 ) {
       // Keep reading chunks...
       const int n = sizeof(chunk) - sizeof(chunk.data);
       int t = input->readBlock( (char*)&chunk, n );
       if ( t != n ) {
     if ( t == -1 )
         return FALSE;
     return TRUE;
       }
       if ( qstrncmp(chunk.id,"data",4) == 0 ) {
     samples = wavedata_remaining = chunk.size;
       } else if ( qstrncmp(chunk.id,"RIFF",4) == 0 ) {
     char d[4];
     if ( input->readBlock(d,4) != 4 ) {
         return FALSE;
@@ -197,96 +196,97 @@ public:
 
 WavPlugin::WavPlugin() {
     d = new WavPluginData;
     d->input = 0;
 }
 
 
 WavPlugin::~WavPlugin() {
     close();
     delete d;
 }
 
 
 bool WavPlugin::isFileSupported( const QString& path ) {
 //    qDebug( "WavPlugin::isFileSupported" );
 
     char *ext = strrchr( path.latin1(), '.' );
 
     // Test file extension
     if ( ext ) {
   if ( strncasecmp(ext, ".raw", 4) == 0 )
       return TRUE;
   if ( strncasecmp(ext, ".wav", 4) == 0 )
       return TRUE;
   if ( strncasecmp(ext, ".wave", 4) == 0 )
       return TRUE;
     }
 
     return FALSE;
 }
 
 
 bool WavPlugin::open( const QString& path ) {
 //    qDebug( "WavPlugin::open" );
 
     d->max = d->out = sound_buffer_size;
     d->wavedata_remaining = 0;
     d->samples_due = 0;
 
     d->input = new QFile( path );
     if ( d->input->open(IO_ReadOnly) == FALSE ) {
   qDebug("couldn't open file");
   delete d->input;
   d->input = 0;
   return FALSE;
     }
 
     d->initialise();
+    qApp->processEvents();
 
     return TRUE;
 }
 
 
 bool WavPlugin::close() {
 //    qDebug( "WavPlugin::close" );
 
     d->input->close();
     delete d->input;
     d->input = 0;
     return TRUE;
 }
 
 
 bool WavPlugin::isOpen() {
 //    qDebug( "WavPlugin::isOpen" );
     return ( d->input != 0 );
 }
 
 
 int WavPlugin::audioStreams() {
 //    qDebug( "WavPlugin::audioStreams" );
     return 1;
 }
 
 
 int WavPlugin::audioChannels( int ) {
 //    qDebug( "WavPlugin::audioChannels" );
     return d->chunkdata.channels;// 2; // ### Always scale audio to stereo samples
 }
 
 
 int WavPlugin::audioFrequency( int ) {
 //    qDebug( "WavPlugin::audioFrequency %d", d->chunkdata.samplesPerSec );
     return  d->chunkdata.samplesPerSec; //44100; // ### Always scale to frequency of 44100
 }
 
 
 int WavPlugin::audioSamples( int ) {
 //    qDebug( "WavPlugin::audioSamples" );
     return d->samples / d->chunkdata.channels/2; // ### Scaled samples will be made stereo,
         // Therefore if source is mono we will double the number of samples
 }
 
 
 bool WavPlugin::audioSetSample( long, int ) {
 //    qDebug( "WavPlugin::audioSetSample" );