Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 5b277cc..f53def6 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -202,22 +202,18 @@ void PlayListWidget::writeDefaultPlaylist() { | |||
202 | } | 202 | } |
203 | } | 203 | } |
204 | } | 204 | } |
205 | 205 | ||
206 | void PlayListWidget::addToSelection( const DocLnk& lnk ) { | 206 | void PlayListWidget::addToSelection( const DocLnk& lnk ) { |
207 | d->setDocumentUsed = FALSE; | 207 | d->setDocumentUsed = FALSE; |
208 | if ( mediaPlayerState->isUsingPlaylist() ) { | ||
209 | if( QFileInfo( lnk.file() ).exists() || | 208 | if( QFileInfo( lnk.file() ).exists() || |
210 | lnk.file().left(4) == "http" ) { | 209 | lnk.file().left(4) == "http" ) { |
211 | d->selectedFiles->addToSelection( lnk ); | 210 | d->selectedFiles->addToSelection( lnk ); |
212 | } | 211 | } |
213 | // writeCurrentM3u(); | 212 | // writeCurrentM3u(); |
214 | } | 213 | } |
215 | else | ||
216 | mediaPlayerState->setPlaying( TRUE ); | ||
217 | } | ||
218 | 214 | ||
219 | 215 | ||
220 | void PlayListWidget::clearList() { | 216 | void PlayListWidget::clearList() { |
221 | while ( first() ) { | 217 | while ( first() ) { |
222 | d->selectedFiles->removeSelected(); | 218 | d->selectedFiles->removeSelected(); |
223 | } | 219 | } |
@@ -419,22 +415,17 @@ void PlayListWidget::useSelectedDocument() { | |||
419 | } | 415 | } |
420 | 416 | ||
421 | 417 | ||
422 | const DocLnk *PlayListWidget::current() const { // this is fugly | 418 | const DocLnk *PlayListWidget::current() const { // this is fugly |
423 | assert( currentTab() == CurrentPlayList ); | 419 | assert( currentTab() == CurrentPlayList ); |
424 | 420 | ||
425 | // qDebug("playlist"); | ||
426 | if ( mediaPlayerState->isUsingPlaylist() ) | ||
427 | return d->selectedFiles->current(); | 421 | return d->selectedFiles->current(); |
428 | |||
429 | assert( false ); | ||
430 | } | 422 | } |
431 | 423 | ||
432 | 424 | ||
433 | bool PlayListWidget::prev() { | 425 | bool PlayListWidget::prev() { |
434 | if ( mediaPlayerState->isUsingPlaylist() ) { | ||
435 | if ( mediaPlayerState->isShuffled() ) { | 426 | if ( mediaPlayerState->isShuffled() ) { |
436 | const DocLnk *cur = current(); | 427 | const DocLnk *cur = current(); |
437 | int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0)); | 428 | int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0)); |
438 | for ( int i = 0; i < j; i++ ) { | 429 | for ( int i = 0; i < j; i++ ) { |
439 | if ( !d->selectedFiles->next() ) | 430 | if ( !d->selectedFiles->next() ) |
440 | d->selectedFiles->first(); | 431 | d->selectedFiles->first(); |
@@ -451,52 +442,39 @@ bool PlayListWidget::prev() { | |||
451 | } else { | 442 | } else { |
452 | return FALSE; | 443 | return FALSE; |
453 | } | 444 | } |
454 | } | 445 | } |
455 | return TRUE; | 446 | return TRUE; |
456 | } | 447 | } |
457 | } else { | ||
458 | return mediaPlayerState->isLooping(); | ||
459 | } | ||
460 | } | 448 | } |
461 | 449 | ||
462 | 450 | ||
463 | bool PlayListWidget::next() { | 451 | bool PlayListWidget::next() { |
464 | //qDebug("<<<<<<<<<<<<next()"); | 452 | //qDebug("<<<<<<<<<<<<next()"); |
465 | if ( mediaPlayerState->isUsingPlaylist() ) { | ||
466 | if ( mediaPlayerState->isShuffled() ) { | 453 | if ( mediaPlayerState->isShuffled() ) { |
467 | return prev(); | 454 | return prev(); |
468 | } else { | 455 | } else { |
469 | if ( !d->selectedFiles->next() ) { | 456 | if ( !d->selectedFiles->next() ) { |
470 | if ( mediaPlayerState->isLooping() ) { | 457 | if ( mediaPlayerState->isLooping() ) { |
471 | return d->selectedFiles->first(); | 458 | return d->selectedFiles->first(); |
472 | } else { | 459 | } else { |
473 | return FALSE; | 460 | return FALSE; |
474 | } | 461 | } |
475 | } | 462 | } |
476 | return TRUE; | 463 | return TRUE; |
477 | } | 464 | } |
478 | } else { | ||
479 | return mediaPlayerState->isLooping(); | ||
480 | } | ||
481 | } | 465 | } |
482 | 466 | ||
483 | 467 | ||
484 | bool PlayListWidget::first() { | 468 | bool PlayListWidget::first() { |
485 | if ( mediaPlayerState->isUsingPlaylist() ) | ||
486 | return d->selectedFiles->first(); | 469 | return d->selectedFiles->first(); |
487 | else | ||
488 | return mediaPlayerState->isLooping(); | ||
489 | } | 470 | } |
490 | 471 | ||
491 | 472 | ||
492 | bool PlayListWidget::last() { | 473 | bool PlayListWidget::last() { |
493 | if ( mediaPlayerState->isUsingPlaylist() ) | ||
494 | return d->selectedFiles->last(); | 474 | return d->selectedFiles->last(); |
495 | else | ||
496 | return mediaPlayerState->isLooping(); | ||
497 | } | 475 | } |
498 | 476 | ||
499 | 477 | ||
500 | void PlayListWidget::saveList() { | 478 | void PlayListWidget::saveList() { |
501 | writem3u(); | 479 | writem3u(); |
502 | } | 480 | } |