[Scummvm-cvs-logs] SF.net SVN: scummvm:[51098] scummvm/trunk/engines/kyra/kyra_v1.cpp

[lordhoto at users.sourceforge.net]

Revision: 51098
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51098&view=rev
Author:   lordhoto
Date:     2010-07-21 19:20:10 +0000 (Wed, 21 Jul 2010)

Log Message:
-----------
KYRA: Respect mute setting on engine startup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v1.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp	2010-07-21 19:19:33 UTC (rev 51097)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp	2010-07-21 19:20:10 UTC (rev 51098)
@@ -100,9 +100,7 @@
 
 Common::Error KyraEngine_v1::init() {
 	// Setup mixer
-	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
-	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
-	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
+	syncSoundSettings();
 
 	if (!_flags.useDigSound) {
 		// We prefer AdLib over MIDI in Kyra 1, since it offers MT-32 support only, most users don't have a real


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.