From 7510e8e613d9e1276aa4520cb12c295543d51159 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Tue, 15 Apr 2025 21:39:00 +0200
Subject: [PATCH] Implement Poly Mode (CC 127) support and fix OMNI mode
channel memory
---
src/mididevice.cpp | 14 ++++++++++++--
src/mididevice.h | 1 +
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/mididevice.cpp b/src/mididevice.cpp
index d468455..90fefbd 100644
--- a/src/mididevice.cpp
+++ b/src/mididevice.cpp
@@ -88,6 +88,7 @@ CMIDIDevice::CMIDIDevice (CMiniDexed *pSynthesizer, CConfig *pConfig, CUserInter
for (unsigned nTG = 0; nTG < CConfig::AllToneGenerators; nTG++)
{
m_ChannelMap[nTG] = Disabled;
+ m_PreviousChannelMap[nTG] = Disabled; // Initialize previous channel map
}
m_nMIDISystemCCVol = m_pConfig->GetMIDISystemCCVol();
@@ -136,6 +137,12 @@ CMIDIDevice::~CMIDIDevice (void)
void CMIDIDevice::SetChannel (u8 ucChannel, unsigned nTG)
{
assert (nTG < CConfig::AllToneGenerators);
+
+ // When changing to OMNI mode, store the previous channel
+ if (ucChannel == OmniMode && m_ChannelMap[nTG] != OmniMode) {
+ m_PreviousChannelMap[nTG] = m_ChannelMap[nTG];
+ }
+
m_ChannelMap[nTG] = ucChannel;
}
@@ -536,8 +543,11 @@ void CMIDIDevice::MIDIMessageHandler (const u8 *pMessage, size_t nLength, unsign
case MIDI_CC_OMNI_MODE_OFF:
// Sets to "Omni Off" mode
if (m_ChannelMap[nTG] == OmniMode) {
- m_pSynthesizer->SetMIDIChannel(ucChannel, nTG);
- LOGDBG("Omni Mode Off: TG %d set to MIDI channel %d", nTG, ucChannel+1);
+ // Restore the previous channel if available, otherwise use current channel
+ u8 channelToRestore = (m_PreviousChannelMap[nTG] != Disabled) ?
+ m_PreviousChannelMap[nTG] : ucChannel;
+ m_pSynthesizer->SetMIDIChannel(channelToRestore, nTG);
+ LOGDBG("Omni Mode Off: TG %d restored to MIDI channel %d", nTG, channelToRestore+1);
}
break;
diff --git a/src/mididevice.h b/src/mididevice.h
index a8eae40..94b789b 100644
--- a/src/mididevice.h
+++ b/src/mididevice.h
@@ -70,6 +70,7 @@ private:
CUserInterface *m_pUI;
u8 m_ChannelMap[CConfig::AllToneGenerators];
+ u8 m_PreviousChannelMap[CConfig::AllToneGenerators]; // Store previous channels for OMNI OFF restore
unsigned m_nMIDISystemCCVol;
unsigned m_nMIDISystemCCPan;