Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index b8023ca..043d8ba 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -144,33 +144,32 @@ void MediaPlayer::next() { | |||
144 | if ( playList.next() ) { | 144 | if ( playList.next() ) { |
145 | play(); | 145 | play(); |
146 | } else if ( mediaPlayerState.isLooping() ) { | 146 | } else if ( mediaPlayerState.isLooping() ) { |
147 | if ( playList.first() ) { | 147 | if ( playList.first() ) { |
148 | play(); | 148 | play(); |
149 | } | 149 | } |
150 | } else { | 150 | } else { |
151 | mediaPlayerState.setList(); | 151 | mediaPlayerState.setList(); |
152 | } | 152 | } |
153 | } else { //if playing from file list, let's just stop | 153 | } else { //if playing from file list, let's just stop |
154 | odebug << "<<<<<<<<<<<<<<<<<stop for filelists" << oendl; | 154 | odebug << "<<<<<<<<<<<<<<<<<stop for filelists" << oendl; |
155 | mediaPlayerState.setPlaying(false); | 155 | mediaPlayerState.setPlaying(false); |
156 | mediaPlayerState.setDisplayType( MediaPlayerState::MediaSelection ); | 156 | mediaPlayerState.setDisplayType( MediaPlayerState::MediaSelection ); |
157 | if(l) mediaPlayerState.setLooping(l); | 157 | if(l) mediaPlayerState.setLooping(l); |
158 | if(r) mediaPlayerState.setShuffled(r); | 158 | if(r) mediaPlayerState.setShuffled(r); |
159 | } | 159 | } |
160 | qApp->processEvents(); | ||
161 | } | 160 | } |
162 | 161 | ||
163 | 162 | ||
164 | void MediaPlayer::startDecreasingVolume() { | 163 | void MediaPlayer::startDecreasingVolume() { |
165 | volumeDirection = -1; | 164 | volumeDirection = -1; |
166 | startTimer( 100 ); | 165 | startTimer( 100 ); |
167 | volControl->decVol(2); | 166 | volControl->decVol(2); |
168 | } | 167 | } |
169 | 168 | ||
170 | 169 | ||
171 | void MediaPlayer::startIncreasingVolume() { | 170 | void MediaPlayer::startIncreasingVolume() { |
172 | volumeDirection = +1; | 171 | volumeDirection = +1; |
173 | startTimer( 100 ); | 172 | startTimer( 100 ); |
174 | volControl->incVol(2); | 173 | volControl->incVol(2); |
175 | } | 174 | } |
176 | 175 | ||