diff options
| author | Max Horn | 2004-12-27 00:27:00 +0000 |
|---|---|---|
| committer | Max Horn | 2004-12-27 00:27:00 +0000 |
| commit | 67b311713d8f4cfcd460a9649e0075f24278a048 (patch) | |
| tree | b3cc2c445a34084ab1baa645c1ae818c44268eff /simon | |
| parent | 6670b2969a3669ae7bda7103407e8e5e22c2916a (diff) | |
| download | scummvm-rg350-67b311713d8f4cfcd460a9649e0075f24278a048.tar.gz scummvm-rg350-67b311713d8f4cfcd460a9649e0075f24278a048.tar.bz2 scummvm-rg350-67b311713d8f4cfcd460a9649e0075f24278a048.zip | |
Added 'sound types' to the mixer - for now, only plain (for the premixer), SFX and music; volume is now controlled based on the sound type
svn-id: r16330
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 4 | ||||
| -rw-r--r-- | simon/sound.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 61feee10ba..f4d8808004 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -665,7 +665,7 @@ int SimonEngine::init(GameDetector &detector) { warning("Sound initialization failed. " "Features of the game that depend on sound synchronization will most likely break"); set_volume(ConfMan.getInt("sfx_volume")); - _mixer->setMusicVolume(ConfMan.getInt("music_volume")); + _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume")); _system->beginGFXTransaction(); initCommonGFX(detector); @@ -4225,7 +4225,7 @@ void SimonEngine::dx_unlock_attached() { } void SimonEngine::set_volume(byte volume) { - _mixer->setVolume(volume); + _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, volume); } byte SimonEngine::getByte() { diff --git a/simon/sound.cpp b/simon/sound.cpp index d272dc14c6..23582ed53e 100644 --- a/simon/sound.cpp +++ b/simon/sound.cpp @@ -219,7 +219,7 @@ void MP3Sound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) uint32 size = _offsets[sound + i] - _offsets[sound]; - _mixer->playInputStream(handle, makeMP3Stream(_file, size), false); + _mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, makeMP3Stream(_file, size)); } #endif @@ -243,7 +243,7 @@ void VorbisSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) uint32 size = _offsets[sound + i] - _offsets[sound]; - _mixer->playInputStream(handle, makeVorbisStream(_file, size), false); + _mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, makeVorbisStream(_file, size)); } #endif @@ -267,7 +267,7 @@ void FlacSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) uint32 size = _offsets[sound + i] - _offsets[sound]; - _mixer->playInputStream(handle, makeFlacStream(_file, size), false); + _mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, makeFlacStream(_file, size)); } #endif |