-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp index 5e5dfb2..aa85176 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp @@ -120,49 +120,49 @@ void MediaPlayerState::setBlanked( bool b ) { void MediaPlayerState::setScaled( bool b ) { if ( scaled == b ) { return; } scaled = b; emit scaledToggled(b); } void MediaPlayerState::setLooping( bool b ) { if ( looping == b ) { return; } looping = b; emit loopingToggled(b); } void MediaPlayerState::setShuffled( bool b ) { if ( shuffled == b ) { return; } shuffled = b; emit shuffledToggled(b); } -void MediaPlayerState::setPlaylist( bool b ) { +void MediaPlayerState::setUsingPlaylist( bool b ) { if ( usePlaylist == b ) { return; } usePlaylist = b; emit playlistToggled(b); } void MediaPlayerState::setPaused( bool b ) { if ( paused == b ) { paused = FALSE; emit pausedToggled(FALSE); return; } paused = b; emit pausedToggled(b); } void MediaPlayerState::setPlaying( bool b ) { if ( playing == b ) { return; } playing = b; stopped = !b; emit playingToggled(b); @@ -233,41 +233,41 @@ void MediaPlayerState::setVideo() { setView('v'); } void MediaPlayerState::setAudio() { setView('a'); } void MediaPlayerState::toggleFullscreen() { setFullscreen( !fullscreen ); } void MediaPlayerState::toggleScaled() { setScaled( !scaled); } void MediaPlayerState::toggleLooping() { setLooping( !looping); } void MediaPlayerState::toggleShuffled() { setShuffled( !shuffled); } void MediaPlayerState::togglePlaylist() { - setPlaylist( !usePlaylist); + setUsingPlaylist( !usePlaylist); } void MediaPlayerState::togglePaused() { setPaused( !paused); } void MediaPlayerState::togglePlaying() { setPlaying( !playing); } void MediaPlayerState::toggleBlank() { setBlanked( !blanked); } diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h index 04d0445..b99178d 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.h +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h @@ -50,49 +50,49 @@ public: MediaPlayerState( QObject *parent, const char *name ); ~MediaPlayerState(); bool isStreaming() const { return streaming; } bool isSeekable() const { return seekable; } bool isFullscreen() const { return fullscreen; } bool isScaled() const { return scaled; } bool isLooping() const { return looping; } bool isShuffled() const { return shuffled; } bool isUsingPlaylist() const { return usePlaylist; } bool isPaused() const { return paused; } bool isPlaying() const { return playing; } bool isStopped() const { return stopped; } long position() const { return curPosition; } long length() const { return curLength; } char view() const { return curView; } public slots: void setIsStreaming( bool b ); void setIsSeekable( bool b ); void setFullscreen( bool b ); void setScaled( bool b ); void setLooping( bool b ); void setShuffled( bool b ); - void setPlaylist( bool b ); + void setUsingPlaylist( bool b ); void setPaused( bool b ); void setPlaying( bool b ); void setStopped( bool b ); void setPosition( long p ); void updatePosition( long p ); void setLength( long l ); void setView( char v ); void setBlanked( bool b ); void setVideoGamma( int v ); void setPrev(); void setNext(); void setList(); void setVideo(); void setAudio(); void toggleFullscreen(); void toggleScaled(); void toggleLooping(); void toggleShuffled(); void togglePlaylist(); void togglePaused(); void togglePlaying(); void toggleBlank(); |