summaryrefslogtreecommitdiff
path: root/core/multimedia/opieplayer/loopcontrol.cpp
authorbipolar <bipolar>2002-02-01 18:41:28 (UTC)
committer bipolar <bipolar>2002-02-01 18:41:28 (UTC)
commit190a0111ccd874923bf88dac938531a18f52e698 (patch) (unidiff)
tree422dcb8c17724eb061624f442f0fa6a3116d789b /core/multimedia/opieplayer/loopcontrol.cpp
parent9a8990097aa35d28a9c758f730c5c8b5fa59560a (diff)
downloadopie-190a0111ccd874923bf88dac938531a18f52e698.zip
opie-190a0111ccd874923bf88dac938531a18f52e698.tar.gz
opie-190a0111ccd874923bf88dac938531a18f52e698.tar.bz2
Mediaplayer hang fix
Diffstat (limited to 'core/multimedia/opieplayer/loopcontrol.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/loopcontrol.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp
index 93a6e3f..6dfd057 100644
--- a/core/multimedia/opieplayer/loopcontrol.cpp
+++ b/core/multimedia/opieplayer/loopcontrol.cpp
@@ -229,5 +229,5 @@ void LoopControl::startAudio() {
229 229
230 long samplesRead = 0; 230 long samplesRead = 0;
231 mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream ); 231 bool readOk=mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream );
232 long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000; 232 long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000;
233 long sampleWaitTime = currentSample - sampleWeShouldBeAt; 233 long sampleWaitTime = currentSample - sampleWeShouldBeAt;
@@ -244,5 +244,5 @@ void LoopControl::startAudio() {
244 audioSampleCounter = currentSample + samplesRead - 1; 244 audioSampleCounter = currentSample + samplesRead - 1;
245 245
246 moreAudio = audioSampleCounter <= total_audio_samples; 246 moreAudio = readOk && (audioSampleCounter <= total_audio_samples);
247 247
248 } else { 248 } else {