mirror of
https://github.com/libretro/scummvm.git
synced 2025-02-21 03:31:40 +00:00
AUDIO: Fix type 9 sound blocks in VOC code.
This should fix missing sound in Touche.
This commit is contained in:
parent
672e981b17
commit
dd42278373
@ -365,10 +365,6 @@ void VocStream::preProcess() {
|
||||
_blocks.erase(lastBlock);
|
||||
}
|
||||
}
|
||||
|
||||
// Check whether we found a new highest rate
|
||||
if (_rate < block.sampleBlock.rate)
|
||||
_rate = block.sampleBlock.rate;
|
||||
} else {
|
||||
block.sampleBlock.rate = _stream->readUint32LE();
|
||||
int bitsPerSample = _stream->readByte();
|
||||
@ -381,7 +377,7 @@ void VocStream::preProcess() {
|
||||
warning("Unhandled channel count %d in VOC file", channels);
|
||||
return;
|
||||
}
|
||||
int codec = _stream->readByte();
|
||||
int codec = _stream->readUint16LE();
|
||||
// We only support 8bit PCM
|
||||
if (codec != 0) {
|
||||
warning("Unhandled codec %d in VOC file", codec);
|
||||
@ -391,6 +387,10 @@ void VocStream::preProcess() {
|
||||
block.sampleBlock.offset = _stream->pos();
|
||||
block.sampleBlock.samples = skip = block.length - 12;
|
||||
}
|
||||
|
||||
// Check whether we found a new highest rate
|
||||
if (_rate < block.sampleBlock.rate)
|
||||
_rate = block.sampleBlock.rate;
|
||||
break;
|
||||
|
||||
// Silence
|
||||
|
Loading…
x
Reference in New Issue
Block a user