diff options
| author | Matthew Hoops | 2011-08-24 09:38:46 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-24 09:54:19 -0400 |
| commit | adb69a5a39bb58a0ac6866b64ede228692a80488 (patch) | |
| tree | a7e4116dd85224c23dcdb49336fb285e8f528a9d /engines/tinsel | |
| parent | 7d5f6fedda6044efba4e0f3eadd413f6cd59a56e (diff) | |
| download | scummvm-rg350-adb69a5a39bb58a0ac6866b64ede228692a80488.tar.gz scummvm-rg350-adb69a5a39bb58a0ac6866b64ede228692a80488.tar.bz2 scummvm-rg350-adb69a5a39bb58a0ac6866b64ede228692a80488.zip | |
AUDIO: Rename Vag to XA
Vag is really an XA container, and one that we do not have a decoder for (nor need)
Diffstat (limited to 'engines/tinsel')
| -rw-r--r-- | engines/tinsel/sound.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index bf48dd1511..130928d885 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -41,8 +41,9 @@ #include "audio/decoders/flac.h" #include "audio/decoders/mp3.h" #include "audio/decoders/raw.h" -#include "audio/decoders/vag.h" #include "audio/decoders/vorbis.h" +#include "audio/decoders/xa.h" + #include "gui/message.h" @@ -106,8 +107,8 @@ bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::Sound error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage)); if (TinselV1PSX) { - // Read the stream and create a VAG Audio stream - Audio::AudioStream *vagStream = Audio::makeVagStream(_sampleStream.readStream(sampleLen), 44100); + // Read the stream and create a XA ADPCM audio stream + Audio::AudioStream *xaStream = Audio::makeXAStream(_sampleStream.readStream(sampleLen), 44100); // FIXME: Should set this in a different place ;) _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, _vm->_config->_soundVolume); @@ -115,7 +116,7 @@ bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::Sound _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, _vm->_config->_voiceVolume); // Play the audio stream - _vm->_mixer->playStream(type, &curChan.handle, vagStream); + _vm->_mixer->playStream(type, &curChan.handle, xaStream); } else { // allocate a buffer byte *sampleBuf = (byte *)malloc(sampleLen); |