diff options
author | Travis Howell | 2009-02-07 05:05:14 +0000 |
---|---|---|
committer | Travis Howell | 2009-02-07 05:05:14 +0000 |
commit | 4131d3d07feec064fa129e1675d39eb3b14d4e8e (patch) | |
tree | d87b75471679d0f649508ae1d858782ee2f6199e | |
parent | 8c84ec82fc9b392f4c17ccd2318ce1c885cd041c (diff) | |
download | scummvm-rg350-4131d3d07feec064fa129e1675d39eb3b14d4e8e.tar.gz scummvm-rg350-4131d3d07feec064fa129e1675d39eb3b14d4e8e.tar.bz2 scummvm-rg350-4131d3d07feec064fa129e1675d39eb3b14d4e8e.zip |
Fix sound noise regression in CD32 version of Simon the Sorcerer 1.
svn-id: r36236
-rw-r--r-- | engines/igor/igor.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/sound.cpp | 2 | ||||
-rw-r--r-- | engines/scumm/sound.cpp | 2 | ||||
-rw-r--r-- | engines/touche/resource.cpp | 4 | ||||
-rw-r--r-- | sound/voc.cpp | 4 |
5 files changed, 5 insertions, 9 deletions
diff --git a/engines/igor/igor.cpp b/engines/igor/igor.cpp index 838f78fbd1..8144cc670b 100644 --- a/engines/igor/igor.cpp +++ b/engines/igor/igor.cpp @@ -424,7 +424,7 @@ void IgorEngine::playSound(int num, int type) { return; } _sndFile.seek(soundOffset); - Audio::AudioStream *stream = Audio::makeVOCStream(_sndFile); + Audio::AudioStream *stream = Audio::makeVOCStream(_sndFile, Audio::Mixer::FLAG_UNSIGNED); if (stream) { _mixer->playInputStream(soundType, soundHandle, stream); } diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index f3c4789ddf..47045c21cd 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -98,7 +98,7 @@ int32 Sound::voicePlay(const char *file, uint8 volume, bool isSfx) { return 0; Common::MemoryReadStream vocStream(fileData, fileSize); - audioStream = Audio::makeVOCStream(vocStream); + audioStream = Audio::makeVOCStream(vocStream, Audio::Mixer::FLAG_UNSIGNED); delete[] fileData; fileSize = 0; diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index e2d4b93fd9..4f9c02322a 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -666,7 +666,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle #endif break; default: - input = Audio::makeVOCStream(*_sfxFile); + input = Audio::makeVOCStream(*_sfxFile, Audio::Mixer::FLAG_UNSIGNED); break; } diff --git a/engines/touche/resource.cpp b/engines/touche/resource.cpp index 805a3503f1..0434b198d6 100644 --- a/engines/touche/resource.cpp +++ b/engines/touche/resource.cpp @@ -589,7 +589,7 @@ void ToucheEngine::res_loadSound(int priority, int num) { uint32 size; const uint32 offs = res_getDataOffset(kResourceTypeSound, num, &size); _fData.seek(offs); - Audio::AudioStream *stream = Audio::makeVOCStream(_fData); + Audio::AudioStream *stream = Audio::makeVOCStream(_fData, Audio::Mixer::FLAG_UNSIGNED); if (stream) { _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, stream); } @@ -647,7 +647,7 @@ void ToucheEngine::res_loadSpeechSegment(int num) { return; } _fSpeech[i].seek(offs); - stream = Audio::makeVOCStream(_fSpeech[i]); + stream = Audio::makeVOCStream(_fSpeech[i], Audio::Mixer::FLAG_UNSIGNED); } else { if (num >= 750) { num -= 750; diff --git a/sound/voc.cpp b/sound/voc.cpp index 0647568dc4..294c75b064 100644 --- a/sound/voc.cpp +++ b/sound/voc.cpp @@ -164,10 +164,6 @@ AudioStream *makeVOCStream(Common::ReadStream &stream, byte flags, uint loopStar if (!data) return 0; - // Default to unsigned sound data, if not flags set - if (!flags) - flags |= Audio::Mixer::FLAG_UNSIGNED; - return makeLinearInputStream(data, size, rate, flags | Audio::Mixer::FLAG_AUTOFREE, loopStart, loopEnd); } |