13
0

variable name change: make purpose of formerly named "_values" in LV2 plugin UI code more clear

And if this is wrong, then rename it again with the right one
This commit is contained in:
Paul Davis 2015-10-21 08:10:25 -04:00
parent ea95bef27b
commit 0880a166c4
2 changed files with 9 additions and 9 deletions

View File

@ -128,7 +128,7 @@ 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[port_index]) { if (_lv2->get_parameter (port_index) != _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.
@ -191,11 +191,11 @@ LV2PluginUI::output_update()
uint32_t index = _output_ports[i]; uint32_t index = _output_ports[i];
float val = _lv2->get_parameter (index); float val = _lv2->get_parameter (index);
if (val != _values[index]) { if (val != _values_last_sent_to_ui[index]) {
/* Send to GUI */ /* Send to GUI */
suil_instance_port_event ((SuilInstance*)_inst, index, 4, 0, &val); suil_instance_port_event ((SuilInstance*)_inst, index, 4, 0, &val);
/* Cache current value */ /* Cache current value */
_values[index] = val; _values_last_sent_to_ui[index] = val;
} }
} }
@ -207,7 +207,7 @@ LV2PluginUI::output_update()
float val = _lv2->get_parameter (*i); float val = _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[(*i)] = val; _values_last_sent_to_ui[(*i)] = val;
} }
_updates.clear (); _updates.clear ();
@ -219,7 +219,7 @@ LV2PluginUI::LV2PluginUI(boost::shared_ptr<PluginInsert> pi,
, _pi(pi) , _pi(pi)
, _lv2(lv2p) , _lv2(lv2p)
, _gui_widget(NULL) , _gui_widget(NULL)
, _values(NULL) , _values_last_sent_to_ui(NULL)
, _external_ui_ptr(NULL) , _external_ui_ptr(NULL)
, _inst(NULL) , _inst(NULL)
{ {
@ -373,7 +373,7 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
_external_ui_ptr = (struct lv2_external_ui*)GET_WIDGET(_inst); _external_ui_ptr = (struct lv2_external_ui*)GET_WIDGET(_inst);
} }
_values = new float[num_ports]; _values_last_sent_to_ui = new float[num_ports];
_controllables.resize(num_ports); _controllables.resize(num_ports);
for (uint32_t i = 0; i < num_ports; ++i) { for (uint32_t i = 0; i < num_ports; ++i) {
@ -384,7 +384,7 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
whether it is input or output whether it is input or output
*/ */
_values[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)));
@ -432,7 +432,7 @@ LV2PluginUI::lv2ui_free()
LV2PluginUI::~LV2PluginUI () LV2PluginUI::~LV2PluginUI ()
{ {
delete [] _values; delete [] _values_last_sent_to_ui;
_message_update_connection.disconnect(); _message_update_connection.disconnect();
_screen_update_connection.disconnect(); _screen_update_connection.disconnect();

View File

@ -77,7 +77,7 @@ class LV2PluginUI : public PlugUIBase, public Gtk::VBox
Gtk::Widget* _gui_widget; Gtk::Widget* _gui_widget;
/** a box containing the focus, bypass, delete, save / add preset buttons etc. */ /** a box containing the focus, bypass, delete, save / add preset buttons etc. */
Gtk::HBox _ardour_buttons_box; Gtk::HBox _ardour_buttons_box;
float* _values; float* _values_last_sent_to_ui;
std::vector<ControllableRef> _controllables; std::vector<ControllableRef> _controllables;
struct lv2_external_ui_host _external_ui_host; struct lv2_external_ui_host _external_ui_host;
LV2_Feature _external_ui_feature; LV2_Feature _external_ui_feature;