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/sword1 | |
| 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/sword1')
| -rw-r--r-- | engines/sword1/music.cpp | 4 | ||||
| -rw-r--r-- | engines/sword1/sound.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp index b4656ff89f..7a19944c34 100644 --- a/engines/sword1/music.cpp +++ b/engines/sword1/music.cpp @@ -35,7 +35,7 @@ #include "audio/decoders/mp3.h" #include "audio/decoders/vorbis.h" #include "audio/decoders/wave.h" -#include "audio/decoders/vag.h" +#include "audio/decoders/xa.h" #define SMP_BUFSIZE 8192 @@ -131,7 +131,7 @@ bool MusicHandle::playPSX(uint16 id, bool loop) { // not over file size if ((size != 0) && (size != 0xffffffff) && ((int32)(offset + size) <= _file.size())) { _file.seek(offset, SEEK_SET); - _audioSource = Audio::makeLoopingAudioStream(Audio::makeVagStream(_file.readStream(size)), loop ? 0 : 1); + _audioSource = Audio::makeLoopingAudioStream(Audio::makeXAStream(_file.readStream(size)), loop ? 0 : 1); fadeUp(); } else { _audioSource = NULL; diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index f7ab9ca1de..ae693bce5c 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -38,7 +38,7 @@ #include "audio/decoders/raw.h" #include "audio/decoders/vorbis.h" #include "audio/decoders/wave.h" -#include "audio/decoders/vag.h" +#include "audio/decoders/xa.h" namespace Sword1 { @@ -256,7 +256,7 @@ void Sound::playSample(QueueElement *elem) { if (SwordEngine::isPsx()) { uint32 size = READ_LE_UINT32(sampleData); - Audio::AudioStream *audStream = Audio::makeLoopingAudioStream(Audio::makeVagStream(new Common::MemoryReadStream(sampleData + 4, size-4)), (_fxList[elem->id].type == FX_LOOP) ? 0 : 1); + Audio::AudioStream *audStream = Audio::makeLoopingAudioStream(Audio::makeXAStream(new Common::MemoryReadStream(sampleData + 4, size-4)), (_fxList[elem->id].type == FX_LOOP) ? 0 : 1); _mixer->playStream(Audio::Mixer::kSFXSoundType, &elem->handle, audStream, elem->id, volume, pan); } else { uint32 size = READ_LE_UINT32(sampleData + 0x28); @@ -364,7 +364,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) { _cowFile.seek(index * 2048); Common::SeekableReadStream *tmp = _cowFile.readStream(sampleSize); assert(tmp); - stream = Audio::makeVagStream(tmp); + stream = Audio::makeXAStream(tmp); _mixer->playStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream, SOUND_SPEECH_ID, speechVol, speechPan); // with compressed audio, we can't calculate the wave volume. // so default to talking. |