[Scummvm-cvs-logs] SF.net SVN: scummvm: [32864] scummvm/branches/gsoc2008-rtl/engines/touche

[cpage88 at users.sourceforge.net]

Revision: 32864
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32864&view=rev
Author:   cpage88
Date:     2008-06-30 20:21:30 -0700 (Mon, 30 Jun 2008)

Log Message:
-----------
Sound settings for TOUCHE can be configured through the GMM

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/engines/touche/touche.cpp
    scummvm/branches/gsoc2008-rtl/engines/touche/touche.h

Modified: scummvm/branches/gsoc2008-rtl/engines/touche/touche.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/touche/touche.cpp	2008-07-01 03:01:11 UTC (rev 32863)
+++ scummvm/branches/gsoc2008-rtl/engines/touche/touche.cpp	2008-07-01 03:21:30 UTC (rev 32864)
@@ -99,7 +99,7 @@
 
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
-	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, Audio::Mixer::kMaxMixerVolume);
+	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
 	return 0;
 }
 
@@ -238,6 +238,13 @@
 	return _eventMan->getMousePos();
 }
 
+void ToucheEngine::syncSoundSettings() {
+	readConfigurationSettings();
+	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
+	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
+	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
+}
+	
 void ToucheEngine::mainLoop() {
 	restart();
 

Modified: scummvm/branches/gsoc2008-rtl/engines/touche/touche.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/touche/touche.h	2008-07-01 03:01:11 UTC (rev 32863)
+++ scummvm/branches/gsoc2008-rtl/engines/touche/touche.h	2008-07-01 03:21:30 UTC (rev 32864)
@@ -356,6 +356,7 @@
 
 	virtual int init();
 	virtual int go();
+	virtual void syncSoundSettings();
 
 protected:
 


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