diff options
| author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
| commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
| tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /engines/sci/sound/midiparser_sci.h | |
| parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
| parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
| download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip | |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
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; |