gearmulator

commit 6cd0031e6658cf2c803f6ada1b5e716615f611ad
parent 22c7a87f24151aa9dc113680d8cdf5112f080bbf
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date:   Thu,  1 Aug 2024 17:09:51 +0200

fix sync & ringmod updates via CC

Diffstat:
M
source/nord/n2x/n2xJucePlugin/n2xController.cpp
 | 
18
+++++++++++++++---

1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/source/nord/n2x/n2xJucePlugin/n2xController.cpp b/source/nord/n2x/n2xJucePlugin/n2xController.cpp
@@ -131,7 +131,7 @@ namespace n2xJucePlugin
 			auto* paramSync = getParameter("Sync", _e.a & 0xf);
 			auto* paramRingMod = getParameter("RingMod", _e.a & 0xf);
 			paramSync->setValueFromSynth(_e.c & 1, origin);
-			paramRingMod->setUnnormalizedValue((_e.c>>1) & 1, origin);
+			paramRingMod->setValueFromSynth((_e.c>>1) & 1, origin);
 		}
 		else
 		{
@@ -147,14 +147,26 @@ namespace n2xJucePlugin
 		return true;
 	}
 
-	void Controller::sendParameterChange(const pluginLib::Parameter& _parameter, const uint8_t _value)
+	void Controller::sendParameterChange(const pluginLib::Parameter& _parameter, uint8_t _value)
 	{
 		const auto& controllerMap = getParameterDescriptions().getControllerMap();
 
 		const auto& ccs = controllerMap.getControlChanges(synthLib::M_CONTROLCHANGE, _parameter.getParameterIndex());
 		if(ccs.empty())
 			return;
-		sendMidiEvent(synthLib::M_CONTROLCHANGE, ccs.front(), _value);
+
+		const auto cc = ccs.front();
+
+		if(cc == n2x::ControlChange::CCSync)
+		{
+			// sync and ringmod have the same CC, combine them
+			const auto* paramSync = getParameter("Sync", _parameter.getPart());
+			const auto* paramRingMod = getParameter("RingMod", _parameter.getPart());
+
+			_value = static_cast<uint8_t>(paramSync->getUnnormalizedValue() | (paramRingMod->getUnnormalizedValue() << 1));
+		}
+
+		sendMidiEvent(synthLib::M_CONTROLCHANGE, cc, _value);
 	}
 
 	bool Controller::sendSysEx(MidiPacketType _packet, const std::map<pluginLib::MidiDataType, uint8_t>& _params) const