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

AUDIO: Don't abuse rewind() for looping in XA

Browse source 
Thanks to LordHoto for pointing out my stupidity :P
This commit is contained in:
Matthew Hoops 2011-08-25 11:16:58 -04:00
parent 64d2e2db11
commit 9a79a336aa
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
audio/decoders/xa.cpp
View file

@ -41,6 +41,8 @@ private:
Common::SeekableReadStream *_stream;
DisposeAfterUse::Flag _disposeAfterUse;
void seekToPos(uint pos);
byte _predictor;
double _samples[28];
byte _samplesRemaining;
@ -100,7 +102,7 @@ int XAStream::readBuffer(int16 *buffer, const int numSamples) {
byte flags = _stream->readByte();
if (flags == 3) {
// Loop
rewind();
seekToPos(_loopPoint);
continue;
} else if (flags == 6) {
// Set loop point
@ -143,13 +145,16 @@ int XAStream::readBuffer(int16 *buffer, const int numSamples) {
}
bool XAStream::rewind() {
_stream->seek(_loopPoint);
seekToPos(0);
return true;
}
void XAStream::seekToPos(uint pos) {
_stream->seek(pos);
_samplesRemaining = 0;
_predictor = 0;
_s1 = _s2 = 0.0;
_endOfData = false;
return true;
}
RewindableAudioStream *makeXAStream(Common::SeekableReadStream *stream, int rate, DisposeAfterUse::Flag disposeAfterUse) {