diff options
| author | Martin Kiewitz | 2010-09-01 19:20:17 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-09-01 19:20:17 +0000 |
| commit | 64313cd7f10267c29d7e3b963c7bd0ff2e1c7f1a (patch) | |
| tree | 3a04871fa771f61bf48ea4d8afae050e8fc6caa7 /engines/sci/sound/midiparser_sci.h | |
| parent | 4b9a8d8899f3e8946f066e6c8d788f9b45418683 (diff) | |
| download | scummvm-rg350-64313cd7f10267c29d7e3b963c7bd0ff2e1c7f1a.tar.gz scummvm-rg350-64313cd7f10267c29d7e3b963c7bd0ff2e1c7f1a.tar.bz2 scummvm-rg350-64313cd7f10267c29d7e3b963c7bd0ff2e1c7f1a.zip | |
SCI: set master volume correctly
and merge it together with global volume, fixes bug #3053104)
svn-id: r52484
Diffstat (limited to 'engines/sci/sound/midiparser_sci.h')
| -rw-r--r-- | engines/sci/sound/midiparser_sci.h | 4 |
1 files changed, 3 insertions, 1 deletions
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; |