[Scummvm-cvs-logs] SF.net SVN: scummvm:[52373] scummvm/trunk/engines/agi
sev at users.sourceforge.net
sev at users.sourceforge.net
Wed Aug 25 09:41:14 CEST 2010
Revision: 52373
http://scummvm.svn.sourceforge.net/scummvm/?rev=52373&view=rev
Author: sev
Date: 2010-08-25 07:41:14 +0000 (Wed, 25 Aug 2010)
Log Message:
-----------
AGI: Respect mute setting
Modified Paths:
--------------
scummvm/trunk/engines/agi/agi.cpp
scummvm/trunk/engines/agi/agi.h
Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp 2010-08-25 07:40:52 UTC (rev 52372)
+++ scummvm/trunk/engines/agi/agi.cpp 2010-08-25 07:41:14 UTC (rev 52373)
@@ -501,8 +501,7 @@
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 @@
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;
Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h 2010-08-25 07:40:52 UTC (rev 52372)
+++ scummvm/trunk/engines/agi/agi.h 2010-08-25 07:41:14 UTC (rev 52373)
@@ -795,7 +795,6 @@
protected:
// Engine APIs
virtual Common::Error go();
- virtual void syncSoundSettings();
void initialize();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list