diff options
| author | Eugene Sandulenko | 2010-08-25 07:41:14 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-08-25 07:41:14 +0000 |
| commit | fcdb349fa2bf4d93254ca38037483010e6a6c819 (patch) | |
| tree | 347e53180e2b2356e531708f05567b180cb3a568 | |
| parent | c4299cc0c7b789158ebc1e549d02292d2b64f30e (diff) | |
| download | scummvm-rg350-fcdb349fa2bf4d93254ca38037483010e6a6c819.tar.gz scummvm-rg350-fcdb349fa2bf4d93254ca38037483010e6a6c819.tar.bz2 scummvm-rg350-fcdb349fa2bf4d93254ca38037483010e6a6c819.zip | |
AGI: Respect mute setting
svn-id: r52373
| -rw-r--r-- | engines/agi/agi.cpp | 15 | ||||
| -rw-r--r-- | engines/agi/agi.h | 1 |
2 files changed, 1 insertions, 15 deletions
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index e83ef4ead9..b15a4c3bac 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -501,8 +501,7 @@ AgiBase::AgiBase(OSystem *syst, const AGIGameDescription *gameDesc) : Engine(sys AgiEngine::AgiEngine(OSystem *syst, const AGIGameDescription *gameDesc) : AgiBase(syst, gameDesc) { // Setup mixer - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); + syncSoundSettings(); parseFeatures(); @@ -709,18 +708,6 @@ Common::Error AgiEngine::go() { return Common::kNoError; } -void AgiEngine::syncSoundSettings() { - // FIXME/TODO: Please explain why we are using "music_volume" for all - // three different entries here. - int soundVolumeMusic = ConfMan.getInt("music_volume"); - int soundVolumeSFX = ConfMan.getInt("music_volume"); - int soundVolumeSpeech = ConfMan.getInt("music_volume"); - - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic); - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, soundVolumeSFX); - _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, soundVolumeSpeech); -} - void AgiEngine::parseFeatures() { if (!ConfMan.hasKey("features")) return; diff --git a/engines/agi/agi.h b/engines/agi/agi.h index 507e7f7a11..4df8824b0e 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -795,7 +795,6 @@ class AgiEngine : public AgiBase { protected: // Engine APIs virtual Common::Error go(); - virtual void syncSoundSettings(); void initialize(); |