From 6d1350638af7f63d4582e33c83805909aadc5873 Mon Sep 17 00:00:00 2001
From: Christopher Page
Date: Sat, 5 Jul 2008 22:04:15 +0000
Subject: Queen sound settings are now configurable through the GMM

svn-id: r32922
---
 engines/queen/queen.cpp | 4 ++++
 engines/queen/queen.h   | 1 +
 engines/queen/sound.cpp | 3 +--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp
index 5cd94aa2ae..d9890d0c57 100644
--- a/engines/queen/queen.cpp
+++ b/engines/queen/queen.cpp
@@ -180,6 +180,10 @@ void QueenEngine::checkOptionSettings() {
 	}
 }
 
+void QueenEngine::syncSoundSettings() {
+	_sound->setVolume(ConfMan.getInt("music_volume"));
+}
+
 void QueenEngine::readOptionSettings() {
 	_sound->setVolume(ConfMan.getInt("music_volume"));
 	_sound->musicToggle(!ConfMan.getBool("music_mute"));
diff --git a/engines/queen/queen.h b/engines/queen/queen.h
index 29d568e760..6652a08196 100644
--- a/engines/queen/queen.h
+++ b/engines/queen/queen.h
@@ -97,6 +97,7 @@ public:
 	void checkOptionSettings();
 	void readOptionSettings();
 	void writeOptionSettings();
+	virtual void syncSoundSettings();
 
 	int talkSpeed() const { return _talkSpeed; }
 	void talkSpeed(int speed) { _talkSpeed = speed; }
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index d70fe7209d..0801d72ca4 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -224,8 +224,7 @@ void PCSound::playSpeech(const char *base) {
 
 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);
 }
 
-- 
cgit v1.2.3