diff options
| author | Fabio Battaglia | 2009-03-15 10:25:22 +0000 |
|---|---|---|
| committer | Fabio Battaglia | 2009-03-15 10:25:22 +0000 |
| commit | 647276b8859210223c10abe51c09aac5fb6e9159 (patch) | |
| tree | 319fcf6d9c4bcff781a6038d5a6063305b09fd23 /engines/sword1/sound.cpp | |
| parent | 08638c5f772667ea70807bd8780164f0084df147 (diff) | |
| download | scummvm-rg350-647276b8859210223c10abe51c09aac5fb6e9159.tar.gz scummvm-rg350-647276b8859210223c10abe51c09aac5fb6e9159.tar.bz2 scummvm-rg350-647276b8859210223c10abe51c09aac5fb6e9159.zip | |
Moving sword1/vag.* into sound/, to be used by Broken Sword 2 PSX
svn-id: r39416
Diffstat (limited to 'engines/sword1/sound.cpp')
| -rw-r--r-- | engines/sword1/sound.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index cab3c2d2a4..d03afa809a 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -34,12 +34,12 @@ #include "sword1/resman.h" #include "sword1/logic.h" #include "sword1/sword1.h" -#include "sword1/vag.h" #include "sound/flac.h" #include "sound/mp3.h" #include "sound/vorbis.h" #include "sound/wave.h" +#include "sound/vag.h" namespace Sword1 { @@ -169,7 +169,7 @@ void Sound::playSample(QueueElement *elem) { if (SwordEngine::isPsx()) { ; uint32 size = READ_LE_UINT32(sampleData); - Audio::AudioStream *audStream = new VagStream(new Common::MemoryReadStream(sampleData + 4, size-4), _fxList[elem->id].type == FX_LOOP); + Audio::AudioStream *audStream = new Audio::VagStream(new Common::MemoryReadStream(sampleData + 4, size-4), _fxList[elem->id].type == FX_LOOP); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &elem->handle, audStream, elem->id, volume, pan, false, false, false); } else { uint32 size = READ_LE_UINT32(sampleData + 0x28); @@ -268,7 +268,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) { _mixer->playRaw(Audio::Mixer::kSpeechSoundType, &_speechHandle, data, size, 11025, SPEECH_FLAGS, SOUND_SPEECH_ID, speechVol, speechPan); } else if (_cowMode == CowPSX && sampleSize != 0xffffffff) { _cowFile.seek(index * 2048); - _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, new VagStream(_cowFile.readStream(sampleSize)), SOUND_SPEECH_ID, speechVol, speechPan); + _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, new Audio::VagStream(_cowFile.readStream(sampleSize)), SOUND_SPEECH_ID, speechVol, speechPan); // with compressed audio, we can't calculate the wave volume. // so default to talking. for (int cnt = 0; cnt < 480; cnt++) |