gearmulator

commit fde389e0dd79a8ac5029f26e0c46ba0e6adda1c7
parent 8fc27a471a0b0fba80e5089f0eb0a15eae829a39
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date:   Wed, 31 Jul 2024 14:50:00 +0200

support toggle buttons that are enabled for specific paramter values

Diffstat:
M
source/jucePluginLib/parameterbinding.cpp
 | 
39
+++++++++++++++++++++++++++++++++------
M
source/juceUiLib/uiObject.cpp
 | 
11
+++++++++--

2 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/source/jucePluginLib/parameterbinding.cpp b/source/jucePluginLib/parameterbinding.cpp
@@ -184,16 +184,43 @@ namespace pluginLib
 		bind(_btn, _param, CurrentPart);
 	}
 
-	void ParameterBinding::bind(juce::Button& _control, uint32_t _param, uint8_t _part)
+	void ParameterBinding::bind(juce::Button& _control, const uint32_t _param, const uint8_t _part)
 	{
-		const auto v = m_controller.getParameter(_param, _part == CurrentPart ? m_controller.getCurrentPart() : _part);
-		if (!v)
+		const auto param = m_controller.getParameter(_param, _part == CurrentPart ? m_controller.getCurrentPart() : _part);
+		if (!param)
 		{
 			assert(false && "Failed to find parameter");
 			return;
 		}
-		_control.getToggleStateValue().referTo(v->getValueObject());
-		const BoundParameter p{v, &_control, _param, CurrentPart};
+
+		const bool hasCustomValue = _control.getProperties().contains("parametervalue");
+		int paramValue = 1;
+		if(hasCustomValue)
+			paramValue = _control.getProperties()["value"];
+
+		_control.onClick = [&_control, param, paramValue, hasCustomValue]
+		{
+			const auto on = _control.getToggleState();
+			if(hasCustomValue)
+			{
+				if(on)
+					param->setUnnormalizedValueNotifyingHost(paramValue, Parameter::Origin::Ui);
+			}
+			else
+			{
+				param->setUnnormalizedValueNotifyingHost(on ? 1 : 0, Parameter::Origin::Ui);
+			}
+		};
+
+		_control.setToggleState(param->getUnnormalizedValue() == paramValue, juce::dontSendNotification);
+
+		const auto listenerId = param->onValueChanged.addListener([this, &_control, paramValue](const Parameter* _p)
+		{
+			const auto value = _p->getUnnormalizedValue();
+			_control.setToggleState(value == paramValue, juce::dontSendNotification);
+		});
+
+		const BoundParameter p{param, &_control, _param, CurrentPart, listenerId};
 		addBinding(p);
 	}
 
@@ -285,7 +312,7 @@ namespace pluginLib
 
 		auto* button = dynamic_cast<juce::Button*>(_b.component);
 		if(button != nullptr)
-			button->getToggleStateValue().referTo(juce::Value());
+			button->onClick = nullptr;
 
 		if(_b.onChangeListenerId != ParameterListener::InvalidListenerId)
 		{
diff --git a/source/juceUiLib/uiObject.cpp b/source/juceUiLib/uiObject.cpp
@@ -590,9 +590,16 @@ namespace genericUI
 		if(index < 0)
 			throw std::runtime_error("Parameter named " + param + " not found");
 
-		_editor.getInterface().bindParameter(_target, index);
-
 		_target.getProperties().set("parameter", index);
+		
+		if constexpr(std::is_base_of_v<juce::Button, T>)
+		{
+			auto value = getPropertyInt("value", -1);
+			if(value != -1)
+				_target.getProperties().set("parametervalue", value);
+		}
+
+		_editor.getInterface().bindParameter(_target, index);
 	}
 
 	template <typename Target, typename Style> void UiObject::createStyle(Editor& _editor, Target& _target, Style* _style)