Add MPE routing for timbre, pressure.

surge-synthesizer · Oct 18, 2024 · 3575bdd · 3575bdd
1 parent ecc54a6
commit 3575bdd
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 2 deletions.
diff --git a/include/sst/voicemanager/managers/polymanager.h b/include/sst/voicemanager/managers/polymanager.h
@@ -378,6 +378,28 @@ template <typename Cfg, typename VoiceResponder, typename MonoResponder> struct
     {
         monoResponder.setMIDIChannelPressure(channel, pat);
     }
+
+    void routeMIDIMPETimbreToVoice(int16_t port, int16_t channel, int8_t val)
+    {
+        for (auto &vi : voiceInfo)
+        {
+            if (vi.port == port && vi.channel == channel && vi.gated)
+            {
+                responder.setVoiceMIDIMPETimbre(vi.activeVoiceCookie, val);
+            }
+        }
+    }
+
+    void routeMIDIMPEChannelPressureToVoice(int16_t port, int16_t channel, int8_t val)
+    {
+        for (auto &vi : voiceInfo)
+        {
+            if (vi.port == port && vi.channel == channel && vi.gated)
+            {
+                responder.setVoiceMIDIMPEChannelPressure(vi.activeVoiceCookie, val);
+            }
+        }
+    }
 };
 } // namespace sst::voicemanager::managers
 

diff --git a/include/sst/voicemanager/voicemanager.h b/include/sst/voicemanager/voicemanager.h
@@ -37,6 +37,7 @@ template <typename Cfg, typename Responder, typename MonoResponder> struct Voice
     } dialect{MIDI1};
 
     int8_t mpeGlobalChannel{0};
+    int8_t mpeTimbreCC{74};
 
     Responder &responder;
     MonoResponder &monoResponder;
@@ -124,7 +125,21 @@ template <typename Cfg, typename Responder, typename MonoResponder> struct Voice
         switch (voiceMode)
         {
         case POLY:
-            polyManager.routeMIDI1CC(port, channel, cc, val);
+            if (dialect == MIDI1)
+            {
+                polyManager.routeMIDI1CC(port, channel, cc, val);
+            }
+            else if (dialect == MIDI1_MPE)
+            {
+                if (channel == mpeGlobalChannel || cc != mpeTimbreCC)
+                {
+                    polyManager.routeMIDI1CC(port, channel, cc, val);
+                }
+                else
+                {
+                    polyManager.routeMIDIMPETimbreToVoice(port, channel, val);
+                }
+            }
         }
     }
 
@@ -142,7 +157,21 @@ template <typename Cfg, typename Responder, typename MonoResponder> struct Voice
         switch (voiceMode)
         {
         case POLY:
-            polyManager.routeChannelPressure(port, channel, pat);
+            if (dialect == MIDI1)
+            {
+                polyManager.routeChannelPressure(port, channel, pat);
+            }
+            else if (dialect == MIDI1_MPE)
+            {
+                if (channel == mpeGlobalChannel)
+                {
+                    polyManager.routeChannelPressure(port, channel, pat);
+                }
+                else
+                {
+                    polyManager.routeMIDIMPEChannelPressureToVoice(port, channel, pat);
+                }
+            }
         }
     }
     void routeNoteExpression(int16_t port, int16_t channel, int16_t key, int32_t noteid,