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

- Cleanup

Browse Source 
- This time fixed the real cause of the mismatching malloc / delete[] call.

svn-id: r36191
This commit is contained in:
Johannes Schickel 2009-02-01 21:11:03 +00:00
parent 8f91046af4
commit 9df7f7385c
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
engines/kyra/sound.cpp
View File

@ -125,15 +125,28 @@ void Sound::voicePlayFromList(Common::List<const char*> fileList) {
Audio::AppendableAudioStream *out = Audio::makeAppendableAudioStream(22050, Audio::Mixer::FLAG_AUTOFREE | Audio::Mixer::FLAG_UNSIGNED);
for (Common::List<const char*>::iterator i = fileList.begin(); i != fileList.end(); i++) {
uint32 fileSize = 0;
uint8 *file = _vm->resource()->fileData(*i, &fileSize);
Common::MemoryReadStream vocStream(file, fileSize, false);
Common::SeekableReadStream *file = _vm->resource()->createReadStream(*i);
// TODO: Maybe output an warning like "file not found"?
if (!file)
continue;
int size, rate;
uint8 *data = Audio::loadVOCFromStream(vocStream, size, rate);
out->queueBuffer(data, size);
delete[] file;
uint8 *data = Audio::loadVOCFromStream(*file, size, rate);
delete file;
// FIXME/HACK: While loadVOCStream uses malloc / realloc,
// AppendableAudioStream uses delete[] to free the passed buffer.
// As a consequence we just 'move' the data to a buffer allocated
// via new[].
uint8 *vocBuffer = new uint8[size];
assert(vocBuffer);
memcpy(vocBuffer, data, size);
free(data);
out->queueBuffer(vocBuffer, size);
}
out->finish();
_soundChannels[h].file = *fileList.begin();