ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

LV2 UI: use controllable API, don't access plugin directly

Browse Source 
For modulated controls the custom UI shows un-modulated baseline.
This is likely inconsistent with VST and AU custom UI, which may
grab the current modulated value (as if it was automated)
This commit is contained in:
Robin Gareus 2017-02-26 04:01:13 +01:00
parent 62d5b41768
commit 1dab4f08de
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/lv2_plugin_ui.cc
View File

@ -128,7 +128,9 @@ void
LV2PluginUI::control_changed (uint32_t port_index) LV2PluginUI::control_changed (uint32_t port_index)
{ {
/* Must run in GUI thread because we modify _updates with no lock */ /* Must run in GUI thread because we modify _updates with no lock */
if (_lv2->get_parameter (port_index) != _values_last_sent_to_ui[port_index]) { float val = _controllables[port_index] ? _controllables[port_index]->get_value() : _lv2->get_parameter (port_index);
if (val != _values_last_sent_to_ui[port_index]) {
/* current plugin parameter does not match last value received /* current plugin parameter does not match last value received
from GUI, so queue an update to push it to the GUI during from GUI, so queue an update to push it to the GUI during
our regular timeout. our regular timeout.
@ -212,7 +214,7 @@ LV2PluginUI::output_update()
*/ */
for (Updates::iterator i = _updates.begin(); i != _updates.end(); ++i) { for (Updates::iterator i = _updates.begin(); i != _updates.end(); ++i) {
float val = _lv2->get_parameter (*i); float val = _controllables[*i] ? _controllables[*i]->get_value() : _lv2->get_parameter (*i);
/* push current value to the GUI */ /* push current value to the GUI */
suil_instance_port_event ((SuilInstance*)_inst, (*i), 4, 0, &val); suil_instance_port_event ((SuilInstance*)_inst, (*i), 4, 0, &val);
_values_last_sent_to_ui[(*i)] = val; _values_last_sent_to_ui[(*i)] = val;
@ -396,12 +398,13 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
whether it is input or output whether it is input or output
*/ */
_values_last_sent_to_ui[port] = _lv2->get_parameter(port); _values_last_sent_to_ui[port] = _lv2->get_parameter(port);
_controllables[port] = boost::dynamic_pointer_cast<ARDOUR::AutomationControl> ( _controllables[port] = boost::dynamic_pointer_cast<ARDOUR::AutomationControl> (
insert->control(Evoral::Parameter(PluginAutomation, 0, port))); insert->control(Evoral::Parameter(PluginAutomation, 0, port)));
if (_lv2->parameter_is_control(port) && _lv2->parameter_is_input(port)) { if (_lv2->parameter_is_control(port) && _lv2->parameter_is_input(port)) {
if (_controllables[port]) { if (_controllables[port]) {
_values_last_sent_to_ui[port] = _controllables[port]->get_value ();
_controllables[port]->Changed.connect (control_connections, invalidator (*this), boost::bind (&LV2PluginUI::control_changed, this, port), gui_context()); _controllables[port]->Changed.connect (control_connections, invalidator (*this), boost::bind (&LV2PluginUI::control_changed, this, port), gui_context());
} }
} }