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/sword2 | |
| 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/sword2')
| -rw-r--r-- | engines/sword2/music.cpp | 4 | ||||
| -rw-r--r-- | engines/sword2/sound.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp index 63116e954a..1e52cc29a7 100644 --- a/engines/sword2/music.cpp +++ b/engines/sword2/music.cpp @@ -39,7 +39,7 @@ #include "audio/decoders/vorbis.h" #include "audio/decoders/flac.h" #include "audio/decoders/wave.h" -#include "audio/decoders/vag.h" +#include "audio/decoders/xa.h" #include "audio/rate.h" #include "sword2/sword2.h" @@ -267,7 +267,7 @@ Audio::AudioStream *makePSXCLUStream(Common::File *file, int size) { byte *buffer = (byte *)malloc(size); file->read(buffer, size); - return Audio::makeVagStream(new Common::MemoryReadStream(buffer, size, DisposeAfterUse::YES)); + return Audio::makeXAStream(new Common::MemoryReadStream(buffer, size, DisposeAfterUse::YES)); } // ---------------------------------------------------------------------------- diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp index 19e244e61c..d9260cc2d5 100644 --- a/engines/sword2/sound.cpp +++ b/engines/sword2/sound.cpp @@ -47,7 +47,7 @@ #include "sword2/sound.h" #include "audio/decoders/wave.h" -#include "audio/decoders/vag.h" +#include "audio/decoders/xa.h" #define Debug_Printf _vm->_debugger->DebugPrintf @@ -234,7 +234,7 @@ void Sound::playMovieSound(int32 res, int type) { Audio::RewindableAudioStream *input = 0; if (Sword2Engine::isPsx()) { - input = Audio::makeVagStream(stream); + input = Audio::makeXAStream(stream); } else { input = Audio::makeWAVStream(stream, DisposeAfterUse::YES); } @@ -361,7 +361,7 @@ int32 Sound::playFx(Audio::SoundHandle *handle, byte *data, uint32 len, uint8 vo Audio::RewindableAudioStream *input = 0; if (Sword2Engine::isPsx()) - input = Audio::makeVagStream(stream); + input = Audio::makeXAStream(stream); else input = Audio::makeWAVStream(stream, DisposeAfterUse::YES); |