diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/sword1/music.cpp | 2 | ||||
-rw-r--r-- | engines/sword1/sound.cpp | 4 | ||||
-rw-r--r-- | engines/sword2/music.cpp | 2 | ||||
-rw-r--r-- | engines/sword2/sound.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp index 7a19944c34..f31faffd5e 100644 --- a/engines/sword1/music.cpp +++ b/engines/sword1/music.cpp @@ -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::makeXAStream(_file.readStream(size)), loop ? 0 : 1); + _audioSource = Audio::makeLoopingAudioStream(Audio::makeXAStream(_file.readStream(size), 11025), loop ? 0 : 1); fadeUp(); } else { _audioSource = NULL; diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index ae693bce5c..faa07b16b9 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -256,7 +256,7 @@ void Sound::playSample(QueueElement *elem) { if (SwordEngine::isPsx()) { uint32 size = READ_LE_UINT32(sampleData); - Audio::AudioStream *audStream = Audio::makeLoopingAudioStream(Audio::makeXAStream(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), 11025), (_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::makeXAStream(tmp); + stream = Audio::makeXAStream(tmp, 11025); _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. diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp index 1e52cc29a7..1bb08fd36f 100644 --- a/engines/sword2/music.cpp +++ b/engines/sword2/music.cpp @@ -267,7 +267,7 @@ Audio::AudioStream *makePSXCLUStream(Common::File *file, int size) { byte *buffer = (byte *)malloc(size); file->read(buffer, size); - return Audio::makeXAStream(new Common::MemoryReadStream(buffer, size, DisposeAfterUse::YES)); + return Audio::makeXAStream(new Common::MemoryReadStream(buffer, size, DisposeAfterUse::YES), 11025); } // ---------------------------------------------------------------------------- diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp index d9260cc2d5..aea33e99e3 100644 --- a/engines/sword2/sound.cpp +++ b/engines/sword2/sound.cpp @@ -234,7 +234,7 @@ void Sound::playMovieSound(int32 res, int type) { Audio::RewindableAudioStream *input = 0; if (Sword2Engine::isPsx()) { - input = Audio::makeXAStream(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::makeXAStream(stream); + input = Audio::makeXAStream(stream, 11025); else input = Audio::makeWAVStream(stream, DisposeAfterUse::YES); |