libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 17:29:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove sound hacks for DS port, which would cause no speech or subtitles in Simon 1 with speech

Browse Source 
svn-id: r24117
This commit is contained in:
Travis Howell 2006-10-05 00:16:50 +00:00
parent 98f62b9e65
commit b18fdb4c0a
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
engines/agos/sound.cpp
View File

@ -143,13 +143,9 @@ void WavSound::playSound(uint sound, Audio::SoundHandle *handle, byte flags) {
flags |= wavFlags; flags |= wavFlags;
byte *buffer = (byte *)malloc(size); byte *buffer = (byte *)malloc(size);
// Check whether malloc was successful. assert(buffer);
// TODO: Maybe we can handle this more graceful, by reverting to a smaller _file->read(buffer, size);
// buffer and reading the audio data one piece at a time? _mixer->playRaw(handle, buffer, size, rate, flags | Audio::Mixer::FLAG_AUTOFREE);
if (buffer) {
_file->read(buffer, size);
_mixer->playRaw(handle, buffer, size, rate, flags | Audio::Mixer::FLAG_AUTOFREE);
}
} }
void VocSound::playSound(uint sound, Audio::SoundHandle *handle, byte flags) { void VocSound::playSound(uint sound, Audio::SoundHandle *handle, byte flags) {
@ -160,6 +156,7 @@ void VocSound::playSound(uint sound, Audio::SoundHandle *handle, byte flags) {
int size, rate; int size, rate;
byte *buffer = Audio::loadVOCFromStream(*_file, size, rate); byte *buffer = Audio::loadVOCFromStream(*_file, size, rate);
assert(buffer);
_mixer->playRaw(handle, buffer, size, rate, flags | Audio::Mixer::FLAG_AUTOFREE); _mixer->playRaw(handle, buffer, size, rate, flags | Audio::Mixer::FLAG_AUTOFREE);
} }
@ -171,13 +168,9 @@ void RawSound::playSound(uint sound, Audio::SoundHandle *handle, byte flags) {
uint size = _file->readUint32BE(); uint size = _file->readUint32BE();
byte *buffer = (byte *)malloc(size); byte *buffer = (byte *)malloc(size);
// Check whether malloc was successful. assert(buffer);
// TODO: Maybe we can handle this more graceful, by reverting to a smaller _file->read(buffer, size);
// buffer and reading the audio data one piece at a time? _mixer->playRaw(handle, buffer, size, 22050, flags | Audio::Mixer::FLAG_AUTOFREE);
if (buffer) {
_file->read(buffer, size);
_mixer->playRaw(handle, buffer, size, 22050, flags | Audio::Mixer::FLAG_AUTOFREE);
}
} }
#ifdef USE_MAD #ifdef USE_MAD