libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 05:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SAGA: Change Sound::playSoundBuffer to enable looping for all sound formats

Browse Source 
svn-id: r47405
This commit is contained in:
Max Horn 2010-01-20 12:43:59 +00:00
parent f5f6faaf97
commit 7799dc3614
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
engines/saga/sound.cpp
View File

@ -67,44 +67,42 @@ SndHandle *Sound::getHandle() {
void Sound::playSoundBuffer(Audio::SoundHandle *handle, const SoundBuffer &buffer, int volume,
sndHandleType handleType, bool loop) {
Audio::AudioStream *stream = 0;
Audio::RewindableAudioStream *stream = 0;
Audio::Mixer::SoundType soundType = (handleType == kVoiceHandle) ?
Audio::Mixer::kSpeechSoundType : Audio::Mixer::kSFXSoundType;
if (!buffer.isCompressed) {
stream = Audio::makeLoopingAudioStream(
Audio::makeRawMemoryStream(buffer.buffer, buffer.size, DisposeAfterUse::YES, buffer.frequency, buffer.flags),
loop ? 0 : 1);
stream = Audio::makeRawMemoryStream(buffer.buffer, buffer.size, DisposeAfterUse::YES, buffer.frequency, buffer.flags);
} else {
Common::SeekableReadStream *memStream = new Common::MemoryReadStream(buffer.buffer, buffer.size, DisposeAfterUse::YES);
// TODO / FIXME: It seems we don't loop compressed audio at all, but do loop uncompressed data.
// Is that intentional? Seems odd...
switch (buffer.soundType) {
#ifdef USE_MAD
case kSoundMP3:
stream = Audio::makeMP3Stream(new Common::MemoryReadStream(buffer.buffer, buffer.size, DisposeAfterUse::YES), DisposeAfterUse::YES);
break;
case kSoundMP3:
stream = Audio::makeMP3Stream(memStream, DisposeAfterUse::YES);
break;
#endif
#ifdef USE_VORBIS
case kSoundOGG:
stream = Audio::makeVorbisStream(new Common::MemoryReadStream(buffer.buffer, buffer.size, DisposeAfterUse::YES), DisposeAfterUse::YES);
break;
case kSoundOGG:
stream = Audio::makeVorbisStream(memStream, DisposeAfterUse::YES);
break;
#endif
#ifdef USE_FLAC
case kSoundFLAC:
stream = Audio::makeFlacStream(new Common::MemoryReadStream(buffer.buffer, buffer.size, DisposeAfterUse::YES), DisposeAfterUse::YES);
break;
case kSoundFLAC:
stream = Audio::makeFlacStream(memStream, DisposeAfterUse::YES);
break;
#endif
default:
// Unknown compression, ignore sample
warning("Unknown compression, ignoring sound");
break;
default:
// Unknown compression, ignore sample
delete memStream;
warning("Unknown compression, ignoring sound");
break;
}
}
if (stream != NULL)
_mixer->playInputStream(soundType, handle, stream, -1, volume);
_mixer->playInputStream(soundType, handle, Audio::makeLoopingAudioStream(stream, loop ? 0 : 1), -1, volume);
}
void Sound::playSound(SoundBuffer &buffer, int volume, bool loop) {