thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AUDIO: Handle empty parent stream in LoopingAudioStream

Browse source 
This should fix bug #3571139.
This commit is contained in:
Willem Jan Palenstijn 2013-04-21 13:51:31 +02:00
parent ce0a334d30
commit 3a1de9a182
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
audio/audiostream.cpp
View file

@ -98,6 +98,10 @@ LoopingAudioStream::LoopingAudioStream(RewindableAudioStream *stream, uint loops
// TODO: Properly indicate error // TODO: Properly indicate error
_loops = _completeIterations = 1; _loops = _completeIterations = 1;
} }
if (stream->endOfData()) {
// Apparently this is an empty stream
_loops = _completeIterations = 1;
}
} }
int LoopingAudioStream::readBuffer(int16 *buffer, const int numSamples) { int LoopingAudioStream::readBuffer(int16 *buffer, const int numSamples) {
@ -118,6 +122,10 @@ int LoopingAudioStream::readBuffer(int16 *buffer, const int numSamples) {
_loops = _completeIterations = 1; _loops = _completeIterations = 1;
return samplesRead; return samplesRead;
} }
if (_parent->endOfData()) {
// Apparently this is an empty stream
_loops = _completeIterations = 1;
}
return samplesRead + readBuffer(buffer + samplesRead, remainingSamples); return samplesRead + readBuffer(buffer + samplesRead, remainingSamples);
} }