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

[cpage88 at users.sourceforge.net]

Revision: 32922
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32922&view=rev
Author:   cpage88
Date:     2008-07-05 15:04:15 -0700 (Sat, 05 Jul 2008)

Log Message:
-----------
Queen sound settings are now configurable through the GMM

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

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp	2008-07-05 16:44:34 UTC (rev 32921)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp	2008-07-05 22:04:15 UTC (rev 32922)
@@ -180,6 +180,10 @@
 	}
 }
 
+void QueenEngine::syncSoundSettings() {
+	_sound->setVolume(ConfMan.getInt("music_volume"));
+}
+
 void QueenEngine::readOptionSettings() {
 	_sound->setVolume(ConfMan.getInt("music_volume"));
 	_sound->musicToggle(!ConfMan.getBool("music_mute"));

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/queen.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/queen.h	2008-07-05 16:44:34 UTC (rev 32921)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/queen.h	2008-07-05 22:04:15 UTC (rev 32922)
@@ -97,6 +97,7 @@
 	void checkOptionSettings();
 	void readOptionSettings();
 	void writeOptionSettings();
+	virtual void syncSoundSettings();
 
 	int talkSpeed() const { return _talkSpeed; }
 	void talkSpeed(int speed) { _talkSpeed = speed; }

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/sound.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/sound.cpp	2008-07-05 16:44:34 UTC (rev 32921)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/sound.cpp	2008-07-05 22:04:15 UTC (rev 32922)
@@ -224,8 +224,7 @@
 
 void PCSound::setVolume(int vol) {
 	Sound::setVolume(vol);
-	// Set mixer music volume to maximum, since music volume is regulated by MusicPlayer's MIDI messages
-	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, Audio::Mixer::kMaxMixerVolume);
+	_mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, vol);
 	_music->setVolume(vol);
 }
 


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