Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 1f19b30..8136ff1 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp @@ -71,13 +71,13 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name ) MediaPlayer::~MediaPlayer() { delete xineControl; delete volControl; } void MediaPlayer::pauseCheck( bool b ) { - if ( b && !mediaPlayerState->playing() ) { + if ( b && !mediaPlayerState->isPlaying() ) { mediaPlayerState->setPaused( FALSE ); } } void MediaPlayer::play() { mediaPlayerState->setPlaying( FALSE ); @@ -86,13 +86,13 @@ void MediaPlayer::play() { void MediaPlayer::setPlaying( bool play ) { if ( !play ) { return; } - if ( mediaPlayerState->paused() ) { + if ( mediaPlayerState->isPaused() ) { mediaPlayerState->setPaused( FALSE ); return; } QString tickerText, time, fileName; if( playList->whichList() == 0 ) { //check for filelist @@ -108,17 +108,17 @@ void MediaPlayer::setPlaying( bool play ) { } 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->looping(); + l = mediaPlayerState->isLooping(); if(l) { mediaPlayerState->setLooping( false ); } - r = mediaPlayerState->shuffled(); + r = mediaPlayerState->isShuffled(); mediaPlayerState->setShuffled( false ); fileName = playList->currentFileListPathName(); xineControl->play( fileName ); long seconds = mediaPlayerState->length(); time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); @@ -147,13 +147,13 @@ void MediaPlayer::setPlaying( bool play ) { void MediaPlayer::prev() { if( playList->whichList() == 0 ) { //if using the playlist if ( playList->prev() ) { play(); - } else if ( mediaPlayerState->looping() ) { + } else if ( mediaPlayerState->isLooping() ) { if ( playList->last() ) { play(); } } else { mediaPlayerState->setList(); } @@ -163,13 +163,13 @@ void MediaPlayer::prev() { void MediaPlayer::next() { if(playList->whichList() == 0) { //if using the playlist if ( playList->next() ) { play(); - } else if ( mediaPlayerState->looping() ) { + } else if ( mediaPlayerState->isLooping() ) { if ( playList->first() ) { play(); } } else { mediaPlayerState->setList(); } |