author | simon <simon> | 2002-12-02 17:27:32 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 17:27:32 (UTC) |
commit | 2f2f6cfbc31e0144060588b26814301ce99ebd39 (patch) (side-by-side diff) | |
tree | 9ca13234ce515afc57b2a11b5b4f9c2144a6b038 /noncore/multimedia/opieplayer2/playlistwidget.cpp | |
parent | 28f9d0587b2ee6a6a9467f658567a45ab7e95b94 (diff) | |
download | opie-2f2f6cfbc31e0144060588b26814301ce99ebd39.zip opie-2f2f6cfbc31e0144060588b26814301ce99ebd39.tar.gz opie-2f2f6cfbc31e0144060588b26814301ce99ebd39.tar.bz2 |
- as MediaPlayerState::isUsingPlaylist() always returns true we can remove
it and simplify some code in the playlistwidget due to that
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 @@ -205,16 +205,12 @@ void PlayListWidget::writeDefaultPlaylist() { void PlayListWidget::addToSelection( const DocLnk& lnk ) { d->setDocumentUsed = FALSE; - if ( mediaPlayerState->isUsingPlaylist() ) { if( QFileInfo( lnk.file() ).exists() || lnk.file().left(4) == "http" ) { d->selectedFiles->addToSelection( lnk ); } // writeCurrentM3u(); } - else - mediaPlayerState->setPlaying( TRUE ); -} void PlayListWidget::clearList() { @@ -422,16 +418,11 @@ void PlayListWidget::useSelectedDocument() { const DocLnk *PlayListWidget::current() const { // this is fugly assert( currentTab() == CurrentPlayList ); -// qDebug("playlist"); - if ( mediaPlayerState->isUsingPlaylist() ) return d->selectedFiles->current(); - - assert( false ); } bool PlayListWidget::prev() { - if ( mediaPlayerState->isUsingPlaylist() ) { if ( mediaPlayerState->isShuffled() ) { const DocLnk *cur = current(); int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0)); @@ -454,15 +445,11 @@ bool PlayListWidget::prev() { } return TRUE; } - } else { - return mediaPlayerState->isLooping(); - } } bool PlayListWidget::next() { //qDebug("<<<<<<<<<<<<next()"); - if ( mediaPlayerState->isUsingPlaylist() ) { if ( mediaPlayerState->isShuffled() ) { return prev(); } else { @@ -475,25 +462,16 @@ bool PlayListWidget::next() { } return TRUE; } - } else { - return mediaPlayerState->isLooping(); - } } bool PlayListWidget::first() { - if ( mediaPlayerState->isUsingPlaylist() ) return d->selectedFiles->first(); - else - return mediaPlayerState->isLooping(); } bool PlayListWidget::last() { - if ( mediaPlayerState->isUsingPlaylist() ) return d->selectedFiles->last(); - else - return mediaPlayerState->isLooping(); } |