summaryrefslogtreecommitdiff
Unidiff
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
@@ -163,33 +163,33 @@ void MediaPlayerState::setPaused( bool b ) {
163 emit pausedToggled(FALSE); 163 emit pausedToggled(FALSE);
164 return; 164 return;
165 } 165 }
166 paused = b; 166 paused = b;
167 emit pausedToggled(b); 167 emit pausedToggled(b);
168} 168}
169 169
170void MediaPlayerState::setPlaying( bool b ) { 170void MediaPlayerState::setPlaying( bool b ) {
171 if ( playing == b ) { 171 if ( playing == b ) {
172 return; 172 return;
173 } 173 }
174 playing = b; 174 playing = b;
175 stoped = !b; 175 stopped = !b;
176 emit playingToggled(b); 176 emit playingToggled(b);
177} 177}
178 178
179void MediaPlayerState::setStop( bool b ) { 179void MediaPlayerState::setStopped( bool b ) {
180 if ( stoped == b ) { 180 if ( stopped == b ) {
181 return; 181 return;
182 } 182 }
183 stoped = b; 183 stopped = b;
184 emit stopToggled(b); 184 emit stopToggled(b);
185} 185}
186 186
187void MediaPlayerState::setPosition( long p ) { 187void MediaPlayerState::setPosition( long p ) {
188 if ( curPosition == p ) { 188 if ( curPosition == p ) {
189 return; 189 return;
190 } 190 }
191 curPosition = p; 191 curPosition = p;
192 emit positionChanged(p); 192 emit positionChanged(p);
193} 193}
194 194
195void MediaPlayerState::updatePosition( long p ){ 195void MediaPlayerState::updatePosition( long p ){
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
@@ -50,40 +50,40 @@ public:
50 MediaPlayerState( QObject *parent, const char *name ); 50 MediaPlayerState( QObject *parent, const char *name );
51 ~MediaPlayerState(); 51 ~MediaPlayerState();
52 52
53 bool isStreaming() const { return streaming; } 53 bool isStreaming() const { return streaming; }
54 bool isSeekable() const { return seekable; } 54 bool isSeekable() const { return seekable; }
55 bool isFullscreen() const { return fullscreen; } 55 bool isFullscreen() const { return fullscreen; }
56 bool isScaled() const { return scaled; } 56 bool isScaled() const { return scaled; }
57 bool isLooping() const { return looping; } 57 bool isLooping() const { return looping; }
58 bool isShuffled() const { return shuffled; } 58 bool isShuffled() const { return shuffled; }
59 bool isUsingPlaylist() const { return usePlaylist; } 59 bool isUsingPlaylist() const { return usePlaylist; }
60 bool isPaused() const { return paused; } 60 bool isPaused() const { return paused; }
61 bool isPlaying() const { return playing; } 61 bool isPlaying() const { return playing; }
62 bool isStop() const { return stoped; } 62 bool isStopped() const { return stopped; }
63 long position() const { return curPosition; } 63 long position() const { return curPosition; }
64 long length() const { return curLength; } 64 long length() const { return curLength; }
65 char view() const { return curView; } 65 char view() const { return curView; }
66 66
67public slots: 67public slots:
68 void setIsStreaming( bool b ); 68 void setIsStreaming( bool b );
69 void setIsSeekable( bool b ); 69 void setIsSeekable( bool b );
70 void setFullscreen( bool b ); 70 void setFullscreen( bool b );
71 void setScaled( bool b ); 71 void setScaled( bool b );
72 void setLooping( bool b ); 72 void setLooping( bool b );
73 void setShuffled( bool b ); 73 void setShuffled( bool b );
74 void setPlaylist( bool b ); 74 void setPlaylist( bool b );
75 void setPaused( bool b ); 75 void setPaused( bool b );
76 void setPlaying( bool b ); 76 void setPlaying( bool b );
77 void setStop( bool b ); 77 void setStopped( bool b );
78 void setPosition( long p ); 78 void setPosition( long p );
79 void updatePosition( long p ); 79 void updatePosition( long p );
80 void setLength( long l ); 80 void setLength( long l );
81 void setView( char v ); 81 void setView( char v );
82 void setBlanked( bool b ); 82 void setBlanked( bool b );
83 void setVideoGamma( int v ); 83 void setVideoGamma( int v );
84 84
85 void setPrev(); 85 void setPrev();
86 void setNext(); 86 void setNext();
87 void setList(); 87 void setList();
88 void setVideo(); 88 void setVideo();
89 void setAudio(); 89 void setAudio();
@@ -120,24 +120,24 @@ signals:
120 120
121private: 121private:
122 bool streaming; 122 bool streaming;
123 bool seekable; 123 bool seekable;
124 bool fullscreen; 124 bool fullscreen;
125 bool scaled; 125 bool scaled;
126 bool blanked; 126 bool blanked;
127 bool looping; 127 bool looping;
128 bool shuffled; 128 bool shuffled;
129 bool usePlaylist; 129 bool usePlaylist;
130 bool paused; 130 bool paused;
131 bool playing; 131 bool playing;
132 bool stoped; 132 bool stopped;
133 long curPosition; 133 long curPosition;
134 long curLength; 134 long curLength;
135 char curView; 135 char curView;
136 int videoGamma; 136 int videoGamma;
137 void readConfig( Config& cfg ); 137 void readConfig( Config& cfg );
138 138
139}; 139};
140 140
141 141
142#endif // MEDIA_PLAYER_STATE_H 142#endif // MEDIA_PLAYER_STATE_H
143 143