setModulatorValue: make "ui" flag working again, because MIDIbox panels rely on this to avoid feedback loops between LUA and (delayed) UI

midibox · midibox · commit 6e5a0b26ed1e · 2023-10-20T00:21:39.000+02:00
diff --git a/Source/Core/CtrlrModulator/CtrlrModulatorProcessor.cpp b/Source/Core/CtrlrModulator/CtrlrModulatorProcessor.cpp
@@ -46,7 +46,7 @@ void CtrlrModulatorProcessor::handleAsyncUpdate()
 		owner.setProperty (Ids::modulatorValue, currentValue.value);
 	}
 
-	if (valueChangedCbk.get() && !owner.getRestoreState())
+	if (valueChangedCbk.get() && !owner.getRestoreState() && currentValue.lastChangeSource != CtrlrModulatorValue::changedByProgram)
 	{
 		CtrlrPanel &ownerPanel = owner.getOwnerPanel();
 		if (!ownerPanel.getRestoreState() && !ownerPanel.getBootstrapState() && valueChangedCbk->isValid())
diff --git a/Source/Lua/CtrlrLuaManager.cpp b/Source/Lua/CtrlrLuaManager.cpp
@@ -1067,7 +1067,7 @@ void CtrlrModulator::setValueNonMapped (const int newValue, const bool force, co
 
 void CtrlrModulator::setModulatorValue(const int newValue, bool vst, bool midi, bool ui)
 {
-	processor.setValueGeneric (CtrlrModulatorValue (newValue, CtrlrModulatorValue::changedByLua), true, !midi);
+  processor.setValueGeneric (CtrlrModulatorValue (newValue, ui ? CtrlrModulatorValue::changedByProgram : CtrlrModulatorValue::changedByLua), true, !midi);
 }
 
 int CtrlrModulator::getValueMapped() const

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ void CtrlrModulatorProcessor::handleAsyncUpdate()`
`46`	`46`	`owner.setProperty (Ids::modulatorValue, currentValue.value);`
`47`	`47`	`}`
`48`	`48`
`49`		`- if (valueChangedCbk.get() && !owner.getRestoreState())`
	`49`	`+ if (valueChangedCbk.get() && !owner.getRestoreState() && currentValue.lastChangeSource != CtrlrModulatorValue::changedByProgram)`
`50`	`50`	`{`
`51`	`51`	`CtrlrPanel &ownerPanel = owner.getOwnerPanel();`
`52`	`52`	`if (!ownerPanel.getRestoreState() && !ownerPanel.getBootstrapState() && valueChangedCbk->isValid())`
Original file line number	Diff line number	Diff line change
`@@ -1067,7 +1067,7 @@ void CtrlrModulator::setValueNonMapped (const int newValue, const bool force, co`
`1067`	`1067`
`1068`	`1068`	`void CtrlrModulator::setModulatorValue(const int newValue, bool vst, bool midi, bool ui)`
`1069`	`1069`	`{`
`1070`		`- processor.setValueGeneric (CtrlrModulatorValue (newValue, CtrlrModulatorValue::changedByLua), true, !midi);`
	`1070`	`+ processor.setValueGeneric (CtrlrModulatorValue (newValue, ui ? CtrlrModulatorValue::changedByProgram : CtrlrModulatorValue::changedByLua), true, !midi);`
`1071`	`1071`	`}`
`1072`	`1072`
`1073`	`1073`	`int CtrlrModulator::getValueMapped() const`