smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

rename ParameterChanged signal in Plugin to ParameterChangedExternally to reflect its intent, and clean up the result.

Browse source 
The signal exists to notify listeners that something outside of the host's control (e.g. a plugin's own GUI for AU or VST)
has modified a plugin parameter. Previous code had strange feedback loops and ambiguous semantics.

Significant modification of LV2 GUI updating was required.

Still to be tested for feedback loop issues: AudioUnits
This commit is contained in:
Paul Davis 2015-10-20 09:07:51 -04:00
parent f1a6d7816d
commit 336b2eb9a4
11 changed files with 115 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

54
gtk2_ardour/lv2_plugin_ui.cc
View file

@ -20,7 +20,9 @@
#include "ardour/lv2_plugin.h"
#include "ardour/session.h"
#include "pbd/error.h"
#include "pbd/stacktrace.h"
#include "gui_thread.h"
#include "lv2_plugin_ui.h"
#include "timers.h"
@ -53,6 +55,9 @@ LV2PluginUI::write_from_ui(void* controller,
}
boost::shared_ptr<AutomationControl> ac = me->_controllables[port_index];
/* Cache our local copy of the last value received from the GUI */
me->_values[port_index] = *(const float*) buffer;
/* Now update the control itself */
if (ac) {
ac->set_value(*(const float*)buffer);
}
@ -120,26 +125,18 @@ LV2PluginUI::on_external_ui_closed(void* controller)
}
void
LV2PluginUI::parameter_changed(uint32_t port_index, float val)
LV2PluginUI::control_changed (uint32_t port_index)
{
PlugUIBase::parameter_changed(port_index, val);
if (val != _values[port_index]) {
parameter_update(port_index, val);
/* Must run in GUI thread because we modify _updates with no lock */
if (_lv2->get_parameter (port_index) != _values[port_index]) {
/* current plugin parameter does not match last value received
from GUI, so queue an update to push it to the GUI during
our regular timeout.
*/
_updates.insert (port_index);
}
}
void
LV2PluginUI::parameter_update(uint32_t port_index, float val)
{
if (!_inst) {
return;
}
suil_instance_port_event((SuilInstance*)_inst, port_index, 4, 0, &val);
_values[port_index] = val;
}
bool
LV2PluginUI::start_updating(GdkEventAny*)
{
@ -183,13 +180,14 @@ LV2PluginUI::output_update()
}
}
/* FIXME only works with control output ports (which is all we support now anyway) */
uint32_t nports = _output_ports.size();
for (uint32_t i = 0; i < nports; ++i) {
uint32_t index = _output_ports[i];
parameter_changed(index, _lv2->get_parameter(index));
if (_inst) {
for (Updates::iterator i = _updates.begin(); i != _updates.end(); ++i) {
float val = _lv2->get_parameter (*i);
/* push current value to the GUI */
suil_instance_port_event ((SuilInstance*)_inst, (*i), 4, 0, &val);
}
_updates.clear ();
}
}
LV2PluginUI::LV2PluginUI(boost::shared_ptr<PluginInsert> pi,
@ -358,12 +356,14 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
bool ok;
uint32_t port = _lv2->nth_parameter(i, ok);
if (ok) {
_values[port] = _lv2->get_parameter(port);
_controllables[port] = boost::dynamic_pointer_cast<ARDOUR::AutomationControl> (
insert->control(Evoral::Parameter(PluginAutomation, 0, port)));
if (_lv2->parameter_is_control(port) && _lv2->parameter_is_input(port)) {
parameter_update(port, _values[port]);
/* FIXME only works with control output ports (which is all we support now anyway) */
if (_controllables[port] && _lv2->parameter_is_control(port) && _lv2->parameter_is_input(port)) {
_controllables[port]->Changed.connect (control_connections, invalidator (*this), boost::bind (&LV2PluginUI::control_changed, this, port), gui_context());
/* queue for first update ("push") to GUI */
_updates.insert (port);
}
}
}
@ -401,9 +401,7 @@ LV2PluginUI::lv2ui_free()
LV2PluginUI::~LV2PluginUI ()
{
if (_values) {
delete[] _values;
}
delete [] _values;
_message_update_connection.disconnect();
_screen_update_connection.disconnect();