aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2011-04-16 18:20:37 +0200
committerJohannes Schickel2011-04-16 18:30:45 +0200
commit6b0ccbb095917d5f98722b26bef07d4a0816bb3b (patch)
treef20a3f2449bb670f9f39c271367625e5071d205f /engines
parentf61eff4404751ad4bf53e8295ea4d5b77847bbed (diff)
downloadscummvm-rg350-6b0ccbb095917d5f98722b26bef07d4a0816bb3b.tar.gz
scummvm-rg350-6b0ccbb095917d5f98722b26bef07d4a0816bb3b.tar.bz2
scummvm-rg350-6b0ccbb095917d5f98722b26bef07d4a0816bb3b.zip
AUDIO: Renamed mute related functions in Mixer.
This renames setMuteForSoundType to muteSoundType and getMuteForSoundType to isSoundTypeMuted.
Diffstat (limited to 'engines')
-rw-r--r--engines/draci/sound.cpp4
-rw-r--r--engines/engine.cpp8
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/draci/sound.cpp b/engines/draci/sound.cpp
index c1ec235246..0df19794f7 100644
--- a/engines/draci/sound.cpp
+++ b/engines/draci/sound.cpp
@@ -422,8 +422,8 @@ void Sound::setVolume() {
_muteSound = _muteVoice = true;
}
- _mixer->setMuteForSoundType(Audio::Mixer::kSFXSoundType, _muteSound);
- _mixer->setMuteForSoundType(Audio::Mixer::kSpeechSoundType, _muteVoice);
+ _mixer->muteSoundType(Audio::Mixer::kSFXSoundType, _muteSound);
+ _mixer->muteSoundType(Audio::Mixer::kSpeechSoundType, _muteVoice);
_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
diff --git a/engines/engine.cpp b/engines/engine.cpp
index 8145a550ab..71f9b68f44 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -439,10 +439,10 @@ void Engine::syncSoundSettings() {
if (ConfMan.hasKey("mute"))
mute = ConfMan.getBool("mute");
- _mixer->setMuteForSoundType(Audio::Mixer::kPlainSoundType, mute);
- _mixer->setMuteForSoundType(Audio::Mixer::kMusicSoundType, mute);
- _mixer->setMuteForSoundType(Audio::Mixer::kSFXSoundType, mute);
- _mixer->setMuteForSoundType(Audio::Mixer::kSpeechSoundType, mute);
+ _mixer->muteSoundType(Audio::Mixer::kPlainSoundType, mute);
+ _mixer->muteSoundType(Audio::Mixer::kMusicSoundType, mute);
+ _mixer->muteSoundType(Audio::Mixer::kSFXSoundType, mute);
+ _mixer->muteSoundType(Audio::Mixer::kSpeechSoundType, mute);
_mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, Audio::Mixer::kMaxMixerVolume);
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic);
_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, soundVolumeSFX);