diff options
| author | Willem Jan Palenstijn | 2013-09-20 23:34:46 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-09-21 01:43:04 +0200 |
| commit | 11d425b76c7d6cdae8b72a1c3c438cc74e9c37a0 (patch) | |
| tree | 0150f91feb417e02cc2ffcd634f9786c77043bad /engines/sci/sound/midiparser_sci.h | |
| parent | 86c2fe47e04449602e4c005fa0a9c183bc8bba39 (diff) | |
| download | scummvm-rg350-11d425b76c7d6cdae8b72a1c3c438cc74e9c37a0.tar.gz scummvm-rg350-11d425b76c7d6cdae8b72a1c3c438cc74e9c37a0.tar.bz2 scummvm-rg350-11d425b76c7d6cdae8b72a1c3c438cc74e9c37a0.zip | |
SCI: Move MIDI event processing out of parseNextEvent
Diffstat (limited to 'engines/sci/sound/midiparser_sci.h')
| -rw-r--r-- | engines/sci/sound/midiparser_sci.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/engines/sci/sound/midiparser_sci.h b/engines/sci/sound/midiparser_sci.h index 7bd68994c8..5784dca1ab 100644 --- a/engines/sci/sound/midiparser_sci.h +++ b/engines/sci/sound/midiparser_sci.h @@ -89,6 +89,7 @@ public: protected: void parseNextEvent(EventInfo &info); + void processEvent(const EventInfo &info, bool fireEvents = true); byte *midiMixChannels(); byte *midiFilterChannels(int channelMask); byte midiGetNextChannel(long ticker); @@ -106,11 +107,6 @@ protected: byte _masterVolume; // the overall master volume (same for all tracks) byte _volume; // the global volume of the current track - bool _signalSet; - int16 _signalToSet; - bool _dataincAdd; - int16 _dataincToAdd; - bool _jumpToHoldTick; bool _resetOnPause; bool _channelUsed[16]; |