diff options
| author | Matthew Hoops | 2011-08-24 09:47:24 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-24 09:54:19 -0400 |
| commit | 40fd9ce27c8579f97e8ca5c0917366b1a069c5e9 (patch) | |
| tree | af0174340d4cd1af79609c2883eca221305c892a /engines/sword1 | |
| parent | adb69a5a39bb58a0ac6866b64ede228692a80488 (diff) | |
| download | scummvm-rg350-40fd9ce27c8579f97e8ca5c0917366b1a069c5e9.tar.gz scummvm-rg350-40fd9ce27c8579f97e8ca5c0917366b1a069c5e9.tar.bz2 scummvm-rg350-40fd9ce27c8579f97e8ca5c0917366b1a069c5e9.zip | |
AUDIO: Remove default rate parameter from xa
Diffstat (limited to 'engines/sword1')
| -rw-r--r-- | engines/sword1/music.cpp | 2 | ||||
| -rw-r--r-- | engines/sword1/sound.cpp | 4 |
2 files changed, 3 insertions, 3 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. |