From 64313cd7f10267c29d7e3b963c7bd0ff2e1c7f1a Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Wed, 1 Sep 2010 19:20:17 +0000
Subject: SCI: set master volume correctly

and merge it together with global volume, fixes bug #3053104)

svn-id: r52484
---
 engines/sci/sound/midiparser_sci.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines/sci/sound/midiparser_sci.h')

diff --git a/engines/sci/sound/midiparser_sci.h b/engines/sci/sound/midiparser_sci.h
index 90db06e539..9d0cb15e74 100644
--- a/engines/sci/sound/midiparser_sci.h
+++ b/engines/sci/sound/midiparser_sci.h
@@ -65,6 +65,7 @@ public:
 	}
 	void sendInitCommands();
 	void unloadMusic();
+	void setMasterVolume(byte masterVolume);
 	void setVolume(byte volume);
 	void stop() {
 		_abort_parse = true;
@@ -104,7 +105,8 @@ protected:
 	SoundResource::Track *_track;
 	MusicEntry *_pSnd;
 	uint32 _loopTick;
-	byte _volume;
+	byte _masterVolume; // the overall master volume (same for all tracks)
+	byte _volume; // the global volume of the current track
 
 	bool _signalSet;
 	int16 _signalToSet;
-- 
cgit v1.2.3