Fixed processing of debounce time for Bx Controller events GrandOrgue…

…#967
oleg68 · Jan 24, 2022 · d078ee2 · d078ee2
1 parent 184862f
commit d078ee2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Fixed processing of debounce time for Bx Controller events https://github.com/GrandOrgue/grandorgue/issues/967
 - Fixed size of the Load organ dialog https://github.com/GrandOrgue/grandorgue/issues/963
 # 3.6.0 (2022-01-19)
 - Fixed crash under OSx when closing a MIDI event dialog opened from a Settings window https://github.com/GrandOrgue/grandorgue/issues/966

diff --git a/src/core/midi/GOMidiReceiverBase.cpp b/src/core/midi/GOMidiReceiverBase.cpp
@@ -690,14 +690,14 @@ MIDI_MATCH_TYPE GOMidiReceiverBase::Match(
       && m_events[i].key == e.GetKey()) {
       if (m_events[i].low_value <= m_events[i].high_value) {
         if (e.GetValue() <= m_events[i].low_value)
-          return MIDI_MATCH_OFF;
+          return debounce(e, MIDI_MATCH_OFF, i);
         if (e.GetValue() >= m_events[i].high_value)
-          return MIDI_MATCH_ON;
+          return debounce(e, MIDI_MATCH_ON, i);
       } else {
         if (e.GetValue() >= m_events[i].low_value)
-          return MIDI_MATCH_OFF;
+          return debounce(e, MIDI_MATCH_OFF, i);
         if (e.GetValue() <= m_events[i].high_value)
-          return MIDI_MATCH_ON;
+          return debounce(e, MIDI_MATCH_ON, i);
       }
       continue;
     }
@@ -728,9 +728,9 @@ MIDI_MATCH_TYPE GOMidiReceiverBase::Match(
       && m_events[i].type == MIDI_M_CTRL_CHANGE_FIXED
       && m_events[i].key == e.GetKey()) {
       if (e.GetValue() == m_events[i].low_value)
-        return MIDI_MATCH_OFF;
+        return debounce(e, MIDI_MATCH_OFF, i);
       if (e.GetValue() == m_events[i].high_value)
-        return MIDI_MATCH_ON;
+        return debounce(e, MIDI_MATCH_ON, i);
       continue;
     }
     if (
@@ -760,9 +760,9 @@ MIDI_MATCH_TYPE GOMidiReceiverBase::Match(
       && m_events[i].key == e.GetKey()) {
       unsigned mask = 1 << m_events[i].low_value;
       if (e.GetValue() & mask)
-        return MIDI_MATCH_ON;
+        return debounce(e, MIDI_MATCH_ON, i);
       else
-        return MIDI_MATCH_OFF;
+        return debounce(e, MIDI_MATCH_OFF, i);
     }
 
     if (