Introduced a data type GOMidiReceiverBase::KeyMap (#2101)

Author: oleg68

src/core/midi/GOMidiReceiverBase.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -463,7 +463,7 @@ GOMidiMatchType GOMidiReceiverBase::Match(const GOMidiEvent &e, int &value) {
 }
 
 GOMidiMatchType GOMidiReceiverBase::Match(
-  const GOMidiEvent &e, const unsigned midi_map[128], int &key, int &value) {
+  const GOMidiEvent &e, const KeyMap *pMidiMap, int &key, int &value) {
   const GOMidiEvent::MidiType eMidiType = e.GetMidiType();
 
   value = 0;
@@ -564,9 +564,9 @@ GOMidiMatchType GOMidiReceiverBase::Match(
         if (key > 127)
           continue;
         if (
-          midi_map && pattern.type != MIDI_M_NOTE_SHORT_OCTAVE
+          pMidiMap && pattern.type != MIDI_M_NOTE_SHORT_OCTAVE
           && pattern.type != MIDI_M_NOTE_NORMAL)
-          key = midi_map[key];
+          key = (*pMidiMap)[key];
         if (pattern.type == MIDI_M_NOTE_NO_VELOCITY) {
           value = e.GetValue() ? 127 : 0;
           if (eMidiType == GOMidiEvent::MIDI_AFTERTOUCH)

src/core/midi/GOMidiReceiverBase.h

@@ -1,13 +1,15 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
 
 #ifndef GOMIDIRECEIVERBASE_H
 #define GOMIDIRECEIVERBASE_H
 
+#include <cstdint>
+
 #include "GOMidiMatchType.h"
 #include "GOMidiReceiverEventPatternList.h"
 #include "GOTime.h"
@@ -19,6 +21,10 @@ class GOMidiMap;
 struct IniFileEnumEntry;
 
 class GOMidiReceiverBase : public GOMidiReceiverEventPatternList {
+public:
+  constexpr static unsigned KEY_MAP_SIZE = 128;
+  using KeyMap = uint8_t[KEY_MAP_SIZE];
+
 private:
   typedef struct {
     unsigned device;
@@ -52,7 +58,7 @@ class GOMidiReceiverBase : public GOMidiReceiverEventPatternList {
   GOMidiMatchType Match(const GOMidiEvent &e);
   GOMidiMatchType Match(const GOMidiEvent &e, int &value);
   GOMidiMatchType Match(
-    const GOMidiEvent &e, const unsigned midi_map[128], int &key, int &value);
+    const GOMidiEvent &e, const KeyMap *pMidiMap, int &key, int &value);
 
   bool HasDebounce(GOMidiReceiverMessageType type);
   bool HasChannel(GOMidiReceiverMessageType type);

src/grandorgue/model/GOManual.cpp

@@ -90,8 +90,8 @@ void GOManual::Init(
   m_MIDIInputNumber = 0;
   m_displayed = false;
   m_manual_number = manualNumber;
-  for (unsigned i = 0; i < 128; i++)
-    m_MidiMap[i] = i;
+  for (unsigned i = 0; i < GOMidiReceiver::KEY_MAP_SIZE; i++)
+    m_MidiKeyMap[i] = (uint8_t)i;
 
   m_stops.resize(0);
   m_couplers.resize(0);
@@ -154,8 +154,8 @@ void GOManual::Load(
 
   m_midi.SetIndex(manualNumber);
 
-  for (unsigned i = 0; i < 128; i++)
-    m_MidiMap[i] = cfg.ReadInteger(
+  for (unsigned i = 0; i < GOMidiReceiver::KEY_MAP_SIZE; i++)
+    m_MidiKeyMap[i] = (uint8_t)cfg.ReadInteger(
       ODFSetting,
       group,
       wxString::Format(wxT("MIDIKey%03d"), i),
@@ -516,7 +516,7 @@ void GOManual::Update() {
 void GOManual::ProcessMidi(const GOMidiEvent &event) {
   int key, value;
 
-  switch (m_midi.Match(event, m_MidiMap, key, value)) {
+  switch (m_midi.Match(event, &m_MidiKeyMap, key, value)) {
   case MIDI_MATCH_ON:
     if (value <= 0)
       value = 1;

src/grandorgue/model/GOManual.h

@@ -27,7 +27,6 @@ class GOConfigReader;
 class GOConfigWriter;
 class GOCoupler;
 class GODivisionalButtonControl;
-class GOMidiEvent;
 class GOStop;
 class GOSwitch;
 class GOTremulant;
@@ -55,7 +54,7 @@ class GOManual : public GOControl,
   std::vector<unsigned> m_Velocity;
   std::vector<unsigned> m_DivisionState;
   std::vector<std::vector<unsigned>> m_Velocities;
-  unsigned m_MidiMap[128];
+  GOMidiReceiver::KeyMap m_MidiKeyMap;
   unsigned m_manual_number;
   unsigned m_first_accessible_logical_key_nb;
   unsigned m_nb_logical_keys;