summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.cpp8
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.h6
2 files changed, 7 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
index 0d21027..4f43465 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
@@ -169,21 +169,21 @@ void MediaPlayerState::setPaused( bool b ) {
void MediaPlayerState::setPlaying( bool b ) {
if ( playing == b ) {
return;
}
playing = b;
- stoped = !b;
+ stopped = !b;
emit playingToggled(b);
}
-void MediaPlayerState::setStop( bool b ) {
- if ( stoped == b ) {
+void MediaPlayerState::setStopped( bool b ) {
+ if ( stopped == b ) {
return;
}
- stoped = b;
+ stopped = b;
emit stopToggled(b);
}
void MediaPlayerState::setPosition( long p ) {
if ( curPosition == p ) {
return;
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h
index 57189dd..04d0445 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.h
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h
@@ -56,13 +56,13 @@ public:
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 isStop() const { return stoped; }
+ 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 );
@@ -71,13 +71,13 @@ public slots:
void setScaled( bool b );
void setLooping( bool b );
void setShuffled( bool b );
void setPlaylist( bool b );
void setPaused( bool b );
void setPlaying( bool b );
- void setStop( 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 );
@@ -126,13 +126,13 @@ private:
bool blanked;
bool looping;
bool shuffled;
bool usePlaylist;
bool paused;
bool playing;
- bool stoped;
+ bool stopped;
long curPosition;
long curLength;
char curView;
int videoGamma;
void readConfig( Config& cfg );