author | simon <simon> | 2002-12-02 14:34:45 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 14:34:45 (UTC) |
commit | 77d55b631fa3cf26bfdf809c17ee3252d3c80ac0 (patch) (side-by-side diff) | |
tree | c57ab11232df562532ab4672db7309fef8c917d9 | |
parent | 11d12e26459315713b46dbe00a52eef0ce9e4d77 (diff) | |
download | opie-77d55b631fa3cf26bfdf809c17ee3252d3c80ac0.zip opie-77d55b631fa3cf26bfdf809c17ee3252d3c80ac0.tar.gz opie-77d55b631fa3cf26bfdf809c17ee3252d3c80ac0.tar.bz2 |
- whichList is deprecated
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 8136ff1..6a38adc 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp @@ -82,33 +82,33 @@ void MediaPlayer::pauseCheck( bool b ) { void MediaPlayer::play() { mediaPlayerState->setPlaying( FALSE ); mediaPlayerState->setPlaying( TRUE ); } void MediaPlayer::setPlaying( bool play ) { if ( !play ) { return; } if ( mediaPlayerState->isPaused() ) { mediaPlayerState->setPaused( FALSE ); return; } QString tickerText, time, fileName; - if( playList->whichList() == 0 ) { //check for filelist + if( playList->currentTab() == PlayListWidget::CurrentPlayList ) { //check for filelist const DocLnk *playListCurrent = playList->current(); if ( playListCurrent != NULL ) { currentFile = playListCurrent; } xineControl->play( currentFile->file() ); fileName = currentFile->name(); long seconds = mediaPlayerState->length();// time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); //qDebug(time); } else { //if playing in file list.. play in a different way // random and looping settings enabled causes problems here, // since there is no selected file in the playlist, but a selected file in the file list, // so we remember and shutoff l = mediaPlayerState->isLooping(); @@ -134,49 +134,49 @@ void MediaPlayer::setPlaying( bool play ) { tickerText = tr( " File: " ) + fileName; } else { tickerText = xineControl->getMetaInfo(); } } else { if ( xineControl->getMetaInfo().isEmpty() ) { tickerText = tr( " File: " ) + fileName + tr( ", Length: " ) + time + " "; } else { tickerText = xineControl->getMetaInfo() + " Length: " + time + " "; } } audioUI->setTickerText( tickerText ); } void MediaPlayer::prev() { - if( playList->whichList() == 0 ) { //if using the playlist + if( playList->currentTab() == PlayListWidget::CurrentPlayList ) { //if using the playlist if ( playList->prev() ) { play(); } else if ( mediaPlayerState->isLooping() ) { if ( playList->last() ) { play(); } } else { mediaPlayerState->setList(); } } } void MediaPlayer::next() { - if(playList->whichList() == 0) { //if using the playlist + if(playList->currentTab() == PlayListWidget::CurrentPlayList) { //if using the playlist if ( playList->next() ) { play(); } else if ( mediaPlayerState->isLooping() ) { if ( playList->first() ) { play(); } } else { mediaPlayerState->setList(); } } else { //if playing from file list, let's just stop qDebug("<<<<<<<<<<<<<<<<<stop for filelists"); mediaPlayerState->setPlaying(false); mediaPlayerState->setView('l'); if(l) mediaPlayerState->setLooping(l); if(r) mediaPlayerState->setShuffled(r); } |