summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-23 22:27:45 (UTC)
committer zecke <zecke>2004-09-23 22:27:45 (UTC)
commitb33878c73018d91101e828101e632c96d39c1381 (patch) (unidiff)
treec2606b2b9941e3a80649415207bd2b9be27ba998
parent97ab73d99688443d02086b4f00d1de7c81faa3c7 (diff)
downloadopie-b33878c73018d91101e828101e632c96d39c1381.zip
opie-b33878c73018d91101e828101e632c96d39c1381.tar.gz
opie-b33878c73018d91101e828101e632c96d39c1381.tar.bz2
If you close the Audio-/VideoWidget and the stream was paused
it didn't play on request. Remove the paused state of MediaPlayerState
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
index ba4e11a..44bc46b 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
@@ -122,137 +122,138 @@ void MediaPlayerState::setScaled( bool b ) {
122} 122}
123 123
124void MediaPlayerState::setLooping( bool b ) { 124void MediaPlayerState::setLooping( bool b ) {
125 if ( looping == b ) { 125 if ( looping == b ) {
126 return; 126 return;
127 } 127 }
128 looping = b; 128 looping = b;
129 emit loopingToggled(b); 129 emit loopingToggled(b);
130} 130}
131 131
132void MediaPlayerState::setShuffled( bool b ) { 132void MediaPlayerState::setShuffled( bool b ) {
133 if ( shuffled == b ) { 133 if ( shuffled == b ) {
134 return; 134 return;
135 } 135 }
136 shuffled = b; 136 shuffled = b;
137 emit shuffledToggled(b); 137 emit shuffledToggled(b);
138} 138}
139 139
140void MediaPlayerState::setPaused( bool b ) { 140void MediaPlayerState::setPaused( bool b ) {
141 if ( paused == b ) { 141 if ( paused == b ) {
142 paused = FALSE; 142 paused = FALSE;
143 emit pausedToggled(FALSE); 143 emit pausedToggled(FALSE);
144 return; 144 return;
145 } 145 }
146 paused = b; 146 paused = b;
147 emit pausedToggled(b); 147 emit pausedToggled(b);
148} 148}
149 149
150void MediaPlayerState::setPlaying( bool b ) { 150void MediaPlayerState::setPlaying( bool b ) {
151 if ( playing == b ) { 151 if ( playing == b ) {
152 return; 152 return;
153 } 153 }
154 playing = b; 154 playing = b;
155 stopped = !b; 155 stopped = !b;
156 emit playingToggled(b); 156 emit playingToggled(b);
157} 157}
158 158
159void MediaPlayerState::setStopped( bool b ) { 159void MediaPlayerState::setStopped( bool b ) {
160 if ( stopped == b ) { 160 if ( stopped == b ) {
161 return; 161 return;
162 } 162 }
163 stopped = b; 163 stopped = b;
164 emit stopToggled(b); 164 emit stopToggled(b);
165} 165}
166 166
167void MediaPlayerState::setPosition( long p ) { 167void MediaPlayerState::setPosition( long p ) {
168 if ( curPosition == p ) { 168 if ( curPosition == p ) {
169 return; 169 return;
170 } 170 }
171 curPosition = p; 171 curPosition = p;
172 emit positionChanged(p); 172 emit positionChanged(p);
173} 173}
174 174
175void MediaPlayerState::updatePosition( long p ){ 175void MediaPlayerState::updatePosition( long p ){
176 if ( curPosition == p ) { 176 if ( curPosition == p ) {
177 return; 177 return;
178 } 178 }
179 curPosition = p; 179 curPosition = p;
180 emit positionUpdated(p); 180 emit positionUpdated(p);
181} 181}
182 182
183void MediaPlayerState::setVideoGamma( int v ){ 183void MediaPlayerState::setVideoGamma( int v ){
184 if ( videoGamma == v ) { 184 if ( videoGamma == v ) {
185 return; 185 return;
186 } 186 }
187 videoGamma = v; 187 videoGamma = v;
188 emit videoGammaChanged( v ); 188 emit videoGammaChanged( v );
189} 189}
190 190
191void MediaPlayerState::setLength( long l ) { 191void MediaPlayerState::setLength( long l ) {
192 if ( curLength == l ) { 192 if ( curLength == l ) {
193 return; 193 return;
194 } 194 }
195 curLength = l; 195 curLength = l;
196 emit lengthChanged(l); 196 emit lengthChanged(l);
197} 197}
198 198
199void MediaPlayerState::setDisplayType( DisplayType displayType ) 199void MediaPlayerState::setDisplayType( DisplayType displayType )
200{ 200{
201 if ( m_displayType == displayType ) 201 if ( m_displayType == displayType )
202 return; 202 return;
203 203
204 m_displayType = displayType; 204 m_displayType = displayType;
205 emit displayTypeChanged( m_displayType ); 205 emit displayTypeChanged( m_displayType );
206} 206}
207 207
208void MediaPlayerState::setPrev(){ 208void MediaPlayerState::setPrev(){
209 emit prev(); 209 emit prev();
210} 210}
211 211
212void MediaPlayerState::setNext() { 212void MediaPlayerState::setNext() {
213 emit next(); 213 emit next();
214} 214}
215 215
216void MediaPlayerState::setList() { 216void MediaPlayerState::setList() {
217 setPlaying( FALSE ); 217 setPlaying( FALSE );
218 paused = false;
218 setDisplayType( MediaSelection ); 219 setDisplayType( MediaSelection );
219} 220}
220 221
221void MediaPlayerState::setVideo() { 222void MediaPlayerState::setVideo() {
222 setDisplayType( Video ); 223 setDisplayType( Video );
223} 224}
224 225
225void MediaPlayerState::setAudio() { 226void MediaPlayerState::setAudio() {
226 setDisplayType( Audio ); 227 setDisplayType( Audio );
227} 228}
228 229
229void MediaPlayerState::toggleFullscreen() { 230void MediaPlayerState::toggleFullscreen() {
230 setFullscreen( !fullscreen ); 231 setFullscreen( !fullscreen );
231} 232}
232 233
233void MediaPlayerState::toggleScaled() { 234void MediaPlayerState::toggleScaled() {
234 setScaled( !scaled); 235 setScaled( !scaled);
235} 236}
236 237
237void MediaPlayerState::toggleLooping() { 238void MediaPlayerState::toggleLooping() {
238 setLooping( !looping); 239 setLooping( !looping);
239} 240}
240 241
241void MediaPlayerState::toggleShuffled() { 242void MediaPlayerState::toggleShuffled() {
242 setShuffled( !shuffled); 243 setShuffled( !shuffled);
243} 244}
244 245
245void MediaPlayerState::togglePaused() { 246void MediaPlayerState::togglePaused() {
246 setPaused( !paused); 247 setPaused( !paused);
247} 248}
248 249
249void MediaPlayerState::togglePlaying() { 250void MediaPlayerState::togglePlaying() {
250 setPlaying( !playing); 251 setPlaying( !playing);
251} 252}
252 253
253void MediaPlayerState::toggleBlank() { 254void MediaPlayerState::toggleBlank() {
254 setBlanked( !blanked); 255 setBlanked( !blanked);
255} 256}
256 257
257 258
258 259