[Scummvm-cvs-logs] SF.net SVN: scummvm:[52374] scummvm/trunk/engines/tinsel

[sev at users.sourceforge.net]

Revision: 52374
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52374&view=rev
Author:   sev
Date:     2010-08-25 07:41:35 +0000 (Wed, 25 Aug 2010)

Log Message:
-----------
TINSEL: Fix bug #3032780: "DW: Mute setting does not work"

Bug #3032778 was fixed too as it is the duplicate.
Since there is no engine-specific logic, rely on superclass'
setupSoundSettings(), and use it on startup too.

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/tinsel.cpp
    scummvm/trunk/engines/tinsel/tinsel.h

Modified: scummvm/trunk/engines/tinsel/tinsel.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinsel.cpp	2010-08-25 07:41:14 UTC (rev 52373)
+++ scummvm/trunk/engines/tinsel/tinsel.cpp	2010-08-25 07:41:35 UTC (rev 52374)
@@ -834,8 +834,7 @@
 	DebugMan.addDebugChannel(kTinselDebugMusic, "music", "Music debugging");
 
 	// Setup mixer
-	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
-	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
+	syncSoundSettings();
 
 	// Add DW2 subfolder to search path in case user is running directly from the CDs
 	const Common::FSNode gameDataDir(ConfMan.get("path"));
@@ -907,17 +906,6 @@
 	MemoryDeinit();
 }
 
-void TinselEngine::syncSoundSettings() {
-	// Sync the engine with the config manager
-	int soundVolumeMusic = ConfMan.getInt("music_volume");
-	int soundVolumeSFX = ConfMan.getInt("sfx_volume");
-	int soundVolumeSpeech = ConfMan.getInt("speech_volume");
-
-	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic);
-	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, soundVolumeSFX);
-	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, soundVolumeSpeech);
-}
-
 Common::String TinselEngine::getSavegameFilename(int16 saveNum) const {
 	char filename[256];
 	snprintf(filename, 256, "%s.%03d", getTargetName().c_str(), saveNum);

Modified: scummvm/trunk/engines/tinsel/tinsel.h
===================================================================
--- scummvm/trunk/engines/tinsel/tinsel.h	2010-08-25 07:41:14 UTC (rev 52373)
+++ scummvm/trunk/engines/tinsel/tinsel.h	2010-08-25 07:41:35 UTC (rev 52374)
@@ -170,7 +170,6 @@
 #if 0
 	bool canSaveGameStateCurrently();
 #endif
-	virtual void syncSoundSettings();
 
 public:
 	TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc);


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