Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 593f072..d1506db 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -176,9 +176,9 @@ PlayListWidget::~PlayListWidget() { | |||
176 | 176 | ||
177 | 177 | ||
178 | void PlayListWidget::initializeStates() { | 178 | void PlayListWidget::initializeStates() { |
179 | d->tbPlay->setOn( mediaPlayerState->playing() ); | 179 | d->tbPlay->setOn( mediaPlayerState->isPlaying() ); |
180 | d->tbLoop->setOn( mediaPlayerState->looping() ); | 180 | d->tbLoop->setOn( mediaPlayerState->isLooping() ); |
181 | d->tbShuffle->setOn( mediaPlayerState->shuffled() ); | 181 | d->tbShuffle->setOn( mediaPlayerState->isShuffled() ); |
182 | setPlaylist( true ); | 182 | setPlaylist( true ); |
183 | } | 183 | } |
184 | 184 | ||
@@ -209,7 +209,7 @@ void PlayListWidget::writeDefaultPlaylist() { | |||
209 | 209 | ||
210 | void PlayListWidget::addToSelection( const DocLnk& lnk ) { | 210 | void PlayListWidget::addToSelection( const DocLnk& lnk ) { |
211 | d->setDocumentUsed = FALSE; | 211 | d->setDocumentUsed = FALSE; |
212 | if ( mediaPlayerState->playlist() ) { | 212 | if ( mediaPlayerState->isUsingPlaylist() ) { |
213 | if( QFileInfo( lnk.file() ).exists() || | 213 | if( QFileInfo( lnk.file() ).exists() || |
214 | lnk.file().left(4) == "http" ) { | 214 | lnk.file().left(4) == "http" ) { |
215 | d->selectedFiles->addToSelection( lnk ); | 215 | d->selectedFiles->addToSelection( lnk ); |
@@ -428,7 +428,7 @@ const DocLnk *PlayListWidget::current() { // this is fugly | |||
428 | case 0: //playlist | 428 | case 0: //playlist |
429 | { | 429 | { |
430 | // qDebug("playlist"); | 430 | // qDebug("playlist"); |
431 | if ( mediaPlayerState->playlist() ) { | 431 | if ( mediaPlayerState->isUsingPlaylist() ) { |
432 | return d->selectedFiles->current(); | 432 | return d->selectedFiles->current(); |
433 | } else if ( d->setDocumentUsed && d->current ) { | 433 | } else if ( d->setDocumentUsed && d->current ) { |
434 | return d->current; | 434 | return d->current; |
@@ -443,8 +443,8 @@ const DocLnk *PlayListWidget::current() { // this is fugly | |||
443 | 443 | ||
444 | 444 | ||
445 | bool PlayListWidget::prev() { | 445 | bool PlayListWidget::prev() { |
446 | if ( mediaPlayerState->playlist() ) { | 446 | if ( mediaPlayerState->isUsingPlaylist() ) { |
447 | if ( mediaPlayerState->shuffled() ) { | 447 | if ( mediaPlayerState->isShuffled() ) { |
448 | const DocLnk *cur = current(); | 448 | const DocLnk *cur = current(); |
449 | int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0)); | 449 | int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0)); |
450 | for ( int i = 0; i < j; i++ ) { | 450 | for ( int i = 0; i < j; i++ ) { |
@@ -458,7 +458,7 @@ bool PlayListWidget::prev() { | |||
458 | return TRUE; | 458 | return TRUE; |
459 | } else { | 459 | } else { |
460 | if ( !d->selectedFiles->prev() ) { | 460 | if ( !d->selectedFiles->prev() ) { |
461 | if ( mediaPlayerState->looping() ) { | 461 | if ( mediaPlayerState->isLooping() ) { |
462 | return d->selectedFiles->last(); | 462 | return d->selectedFiles->last(); |
463 | } else { | 463 | } else { |
464 | return FALSE; | 464 | return FALSE; |
@@ -467,19 +467,19 @@ bool PlayListWidget::prev() { | |||
467 | return TRUE; | 467 | return TRUE; |
468 | } | 468 | } |
469 | } else { | 469 | } else { |
470 | return mediaPlayerState->looping(); | 470 | return mediaPlayerState->isLooping(); |
471 | } | 471 | } |
472 | } | 472 | } |
473 | 473 | ||
474 | 474 | ||
475 | bool PlayListWidget::next() { | 475 | bool PlayListWidget::next() { |
476 | //qDebug("<<<<<<<<<<<<next()"); | 476 | //qDebug("<<<<<<<<<<<<next()"); |
477 | if ( mediaPlayerState->playlist() ) { | 477 | if ( mediaPlayerState->isUsingPlaylist() ) { |
478 | if ( mediaPlayerState->shuffled() ) { | 478 | if ( mediaPlayerState->isShuffled() ) { |
479 | return prev(); | 479 | return prev(); |
480 | } else { | 480 | } else { |
481 | if ( !d->selectedFiles->next() ) { | 481 | if ( !d->selectedFiles->next() ) { |
482 | if ( mediaPlayerState->looping() ) { | 482 | if ( mediaPlayerState->isLooping() ) { |
483 | return d->selectedFiles->first(); | 483 | return d->selectedFiles->first(); |
484 | } else { | 484 | } else { |
485 | return FALSE; | 485 | return FALSE; |
@@ -488,24 +488,24 @@ bool PlayListWidget::next() { | |||
488 | return TRUE; | 488 | return TRUE; |
489 | } | 489 | } |
490 | } else { | 490 | } else { |
491 | return mediaPlayerState->looping(); | 491 | return mediaPlayerState->isLooping(); |
492 | } | 492 | } |
493 | } | 493 | } |
494 | 494 | ||
495 | 495 | ||
496 | bool PlayListWidget::first() { | 496 | bool PlayListWidget::first() { |
497 | if ( mediaPlayerState->playlist() ) | 497 | if ( mediaPlayerState->isUsingPlaylist() ) |
498 | return d->selectedFiles->first(); | 498 | return d->selectedFiles->first(); |
499 | else | 499 | else |
500 | return mediaPlayerState->looping(); | 500 | return mediaPlayerState->isLooping(); |
501 | } | 501 | } |
502 | 502 | ||
503 | 503 | ||
504 | bool PlayListWidget::last() { | 504 | bool PlayListWidget::last() { |
505 | if ( mediaPlayerState->playlist() ) | 505 | if ( mediaPlayerState->isUsingPlaylist() ) |
506 | return d->selectedFiles->last(); | 506 | return d->selectedFiles->last(); |
507 | else | 507 | else |
508 | return mediaPlayerState->looping(); | 508 | return mediaPlayerState->isLooping(); |
509 | } | 509 | } |
510 | 510 | ||
511 | 511 | ||
@@ -1089,7 +1089,7 @@ void PlayListWidget::pmViewActivated(int index) { | |||
1089 | case -16: | 1089 | case -16: |
1090 | { | 1090 | { |
1091 | mediaPlayerState->toggleFullscreen(); | 1091 | mediaPlayerState->toggleFullscreen(); |
1092 | bool b=mediaPlayerState->fullscreen(); | 1092 | bool b=mediaPlayerState->isFullscreen(); |
1093 | pmView->setItemChecked( index, b); | 1093 | pmView->setItemChecked( index, b); |
1094 | Config cfg( "OpiePlayer" ); | 1094 | Config cfg( "OpiePlayer" ); |
1095 | cfg.writeEntry( "FullScreen", b ); | 1095 | cfg.writeEntry( "FullScreen", b ); |