| author | bipolar <bipolar> | 2002-02-01 18:41:28 (UTC) |
|---|---|---|
| committer | bipolar <bipolar> | 2002-02-01 18:41:28 (UTC) |
| commit | 190a0111ccd874923bf88dac938531a18f52e698 (patch) (side-by-side diff) | |
| tree | 422dcb8c17724eb061624f442f0fa6a3116d789b /core/multimedia/opieplayer/loopcontrol.cpp | |
| parent | 9a8990097aa35d28a9c758f730c5c8b5fa59560a (diff) | |
| download | opie-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.cpp | 4 |
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 @@ -228,7 +228,7 @@ void LoopControl::startAudio() { qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter); long samplesRead = 0; - mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream ); + bool readOk=mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream ); long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000; long sampleWaitTime = currentSample - sampleWeShouldBeAt; @@ -243,7 +243,7 @@ void LoopControl::startAudio() { audioDevice->write( audioBuffer, samplesRead * 2 * channels ); audioSampleCounter = currentSample + samplesRead - 1; - moreAudio = audioSampleCounter <= total_audio_samples; + moreAudio = readOk && (audioSampleCounter <= total_audio_samples); } else { |