diff options
| author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
| commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
| tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /engines/sword2/sound.cpp | |
| parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
| parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
| download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/sword2/sound.cpp')
| -rw-r--r-- | engines/sword2/sound.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp index 19e244e61c..aea33e99e3 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, 11025); } 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, 11025); else input = Audio::makeWAVStream(stream, DisposeAfterUse::YES); |