author | bipolar <bipolar> | 2002-03-05 00:42:40 (UTC) |
---|---|---|
committer | bipolar <bipolar> | 2002-03-05 00:42:40 (UTC) |
commit | dbc93b5de1b20489a05ce61e42874bf944165223 (patch) (unidiff) | |
tree | 97faa0273f33a873d2eaa266a2f1e2ad2c2b3a96 /core/multimedia | |
parent | 25be6fb98284dfa0c549d30db5b64c09798ee36d (diff) | |
download | opie-dbc93b5de1b20489a05ce61e42874bf944165223.zip opie-dbc93b5de1b20489a05ce61e42874bf944165223.tar.gz opie-dbc93b5de1b20489a05ce61e42874bf944165223.tar.bz2 |
committed by ljp: fixed a problem opening files from docs tab being added to playlist.
fixed (hopefully) problem with player redraw when playing wavfiles
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 13 | ||||
-rw-r--r-- | core/multimedia/opieplayer/wavplugin/wavplugin.cpp | 2 |
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 | |||
@@ -418,16 +418,13 @@ void PlayListWidget::setDocument(const QString& fileref) { | |||
418 | QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); | 418 | QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); |
419 | return; | 419 | return; |
420 | } | 420 | } |
421 | if ( mediaPlayerState->playlist() ) | 421 | addToSelection( DocLnk( fileref ) ); |
422 | addToSelection( DocLnk( fileref ) ); | 422 | d->setDocumentUsed = TRUE; |
423 | else { | 423 | qApp->processEvents(); |
424 | d->setDocumentUsed = TRUE; | ||
425 | if ( d->current ) | ||
426 | delete d->current; | ||
427 | d->current = new DocLnk( fileref ); | ||
428 | } | ||
429 | mediaPlayerState->setPlaying( FALSE ); | 424 | mediaPlayerState->setPlaying( FALSE ); |
425 | qApp->processEvents(); | ||
430 | mediaPlayerState->setPlaying( TRUE ); | 426 | mediaPlayerState->setPlaying( TRUE ); |
427 | d->selectedFiles->removeSelected( ); | ||
431 | } | 428 | } |
432 | 429 | ||
433 | 430 | ||
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 | |||
@@ -74,7 +74,6 @@ public: | |||
74 | bool add( short *output, long count, long& done, bool stereo ) | 74 | bool add( short *output, long count, long& done, bool stereo ) |
75 | { | 75 | { |
76 | done = 0; | 76 | done = 0; |
77 | qApp->processEvents(); | ||
78 | 77 | ||
79 | if ( input == 0 ) { | 78 | if ( input == 0 ) { |
80 | qDebug("no input"); | 79 | qDebug("no input"); |
@@ -242,6 +241,7 @@ bool WavPlugin::open( const QString& path ) { | |||
242 | } | 241 | } |
243 | 242 | ||
244 | d->initialise(); | 243 | d->initialise(); |
244 | qApp->processEvents(); | ||
245 | 245 | ||
246 | return TRUE; | 246 | return TRUE; |
247 | } | 247 | } |