diff options
| author | Wohlstand <admin@wohlnet.ru> | 2017-11-26 03:08:47 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2017-11-26 03:08:47 +0300 |
| commit | b92cc8e942b91268b096757fe22aca8368ea3de6 (patch) | |
| tree | 086ee97fed7ed2aad2e64e8870021ba032fd9c59 /src/adlmidi_private.hpp | |
| parent | 52bbba002d7f39334e833f3ec9e1de010d161bdf (diff) | |
| parent | 5fa684bd2732f638763cd62bed831ccc6aafc0bf (diff) | |
| download | libADLMIDI-b92cc8e942b91268b096757fe22aca8368ea3de6.tar.gz libADLMIDI-b92cc8e942b91268b096757fe22aca8368ea3de6.tar.bz2 libADLMIDI-b92cc8e942b91268b096757fe22aca8368ea3de6.zip | |
Merge branch 'master' into get-rid-of-backup-buffer
Diffstat (limited to 'src/adlmidi_private.hpp')
| -rw-r--r-- | src/adlmidi_private.hpp | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp index f58f02f..32c3637 100644 --- a/src/adlmidi_private.hpp +++ b/src/adlmidi_private.hpp @@ -249,7 +249,7 @@ public: void NoteOff(size_t c); void NoteOn(unsigned c, double hertz); - void Touch_Real(unsigned c, unsigned volume); + void Touch_Real(unsigned c, unsigned volume, uint8_t brightness = 127); //void Touch(unsigned c, unsigned volume) void Patch(uint16_t c, size_t i); @@ -465,6 +465,8 @@ public: int64_t vibdelay; uint8_t lastlrpn, lastmrpn; bool nrpn; + uint8_t brightness; + bool is_xg_percussion; struct NoteInfo { // Current pressure @@ -501,17 +503,34 @@ public: typedef activenotemap_t::iterator activenoteiterator; char ____padding2[5]; activenotemap_t activenotes; - + void reset() + { + portamento = 0; + bank_lsb = 0; + bank_msb = 0; + patch = 0; + volume = 100; + expression = 127; + panning = 0x30; + vibrato = 0; + sustain = 0; + bend = 0.0; + bendsense = 2 / 8192.0; + vibpos = 0; + vibspeed = 2 * 3.141592653 * 5.0; + vibdepth = 0.5 / 127; + vibdelay = 0; + lastlrpn = 0; + lastmrpn = 0; + nrpn = false; + brightness = 127; + is_xg_percussion = false; + } MIDIchannel() - : portamento(0), - bank_lsb(0), bank_msb(0), patch(0), - volume(100), expression(127), - panning(0x30), vibrato(0), sustain(0), - bend(0.0), bendsense(2 / 8192.0), - vibpos(0), vibspeed(2 * 3.141592653 * 5.0), - vibdepth(0.5 / 127), vibdelay(0), - lastlrpn(0), lastmrpn(0), nrpn(false), - activenotes() { } + : activenotes() + { + reset(); + } }; // Additional information about OPL3 channels |