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, 6 insertions, 9 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
@@ -415,22 +415,19 @@ void PlayListWidget::addAllVideoToList() {
 
 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 );
-    }
+    addToSelection( DocLnk( fileref ) );
+    d->setDocumentUsed = TRUE;
+    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();
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
@@ -71,13 +71,12 @@ public:
     }
 
     // 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;
   }
 
@@ -239,12 +238,13 @@ bool WavPlugin::open( const QString& path ) {
   delete d->input;
   d->input = 0;
   return FALSE;
     }
 
     d->initialise();
+    qApp->processEvents();
 
     return TRUE;
 }
 
 
 bool WavPlugin::close() {