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

Make the bundle parser code a little cleaner :)

Browse source 
svn-id: r4198
This commit is contained in:
James Brown 2002-05-05 02:28:35 +00:00
parent eeda732b36
commit 9f699a21a1
1 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
sound.cpp
View file

@ -768,11 +768,27 @@ void Scumm::decompressBundleSound(int index) {
free(CompFinal); free(CompFinal);
return; return;
} }
size = READ_BE_UINT32(ptr); ptr+=4;
tag = READ_BE_UINT32(ptr); ptr+=4; ptr+=12; /* Skip header */
size = READ_BE_UINT32(ptr); ptr+=size+4; while(tag != 'DATA') {
tag = READ_BE_UINT32(ptr); ptr+=4; tag = READ_BE_UINT32(ptr); ptr+=4;
size = READ_BE_UINT32(ptr); ptr+=4; switch(tag) {
case 'FRMT':
case 'TEXT':
case 'REGN':
case 'STOP':
size = READ_BE_UINT32(ptr); ptr+=size+4;
break;
case 'DATA':
size = READ_BE_UINT32(ptr); ptr+=4;
break;
default:
error("Unknown bundle header %c%c%c%c", tag>>24, tag>>16, tag>>8, tag);
}
}
Final = (unsigned char *)malloc(size); Final = (unsigned char *)malloc(size);
memcpy(&Final[0], &ptr[0], size); memcpy(&Final[0], &ptr[0], size);
_mixer->play_raw(NULL, Final, size, 22050, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE); _mixer->play_raw(NULL, Final, size, 22050, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);