libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 12:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix SubLoopingAudioStream's readBuffer implementation.

Browse Source 
svn-id: r48018
This commit is contained in:
Johannes Schickel 2010-02-09 21:51:47 +00:00
parent d349be1fb8
commit f6aa8d0068
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/audiostream.cpp
View File

@ -180,11 +180,14 @@ SubLoopingAudioStream::~SubLoopingAudioStream() {
}
int SubLoopingAudioStream::readBuffer(int16 *buffer, const int numSamples) {
if (_done)
return 0;
int framesLeft = MIN(_loopEnd.frameDiff(_pos), numSamples);
int framesRead = _parent->readBuffer(buffer, framesLeft);
_pos = _pos.addFrames(framesRead);
if (framesLeft < numSamples || framesRead < framesLeft) {
if (_pos == _loopEnd) {
if (_loops != 0) {
--_loops;
if (!_loops) {
@ -200,13 +203,10 @@ int SubLoopingAudioStream::readBuffer(int16 *buffer, const int numSamples) {
_pos = _loopStart;
framesLeft = numSamples - framesLeft;
framesRead += _parent->readBuffer(buffer + framesRead, framesLeft);
if (_parent->endOfStream())
_done = true;
return framesRead + readBuffer(buffer + framesRead, framesLeft);
} else {
return framesRead;
}
return framesRead;
}
#pragma mark -