From add55f65c5727bfab338be16e6548f9af8756048 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Thu, 3 Sep 2020 00:46:53 +0300 Subject: Fixed an incorrect logic of CC121 Issue #227 --- src/midi_sequencer.hpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/midi_sequencer.hpp') diff --git a/src/midi_sequencer.hpp b/src/midi_sequencer.hpp index 7ff864c..69dead8 100644 --- a/src/midi_sequencer.hpp +++ b/src/midi_sequencer.hpp @@ -76,7 +76,7 @@ class BW_MidiSequencer //! System Exclusive message, type 2 T_SYSEX2 = 0xF7,//size == len //! Special event - T_SPECIAL = 0xFF + T_SPECIAL = 0xFF, }; /** * @brief Special MIDI event sub-types @@ -132,18 +132,21 @@ class BW_MidiSequencer //! [Non-Standard] Loop End point with support of multi-loops ST_LOOPSTACK_BREAK = 0xE6,//size == 0 //! [Non-Standard] Callback Trigger - ST_CALLBACK_TRIGGER = 0xE7//size == 1 + ST_CALLBACK_TRIGGER = 0xE7,//size == 1 + + // Built-in hooks + ST_SONG_BEGIN_HOOK = 0x101 }; //! Main type of event - uint8_t type; + uint_fast16_t type; //! Sub-type of the event - uint8_t subtype; + uint_fast16_t subtype; //! Targeted MIDI channel - uint8_t channel; + uint_fast16_t channel; //! Is valid event - uint8_t isValid; + uint_fast16_t isValid; //! Reserved 5 bytes padding - uint8_t __padding[4]; + uint_fast16_t __padding[4]; //! Absolute tick position (Used for the tempo calculation only) uint64_t absPosition; //! Raw data of this event -- cgit v1.2.3