GenericUI: Update all input controls on preset load

The existing code relies on AutomationControls for getting parameter
changes and update the UI accordingly. One case where this doesn't yet
work is preset loading, where ARDOUR::Plugin is responsible for actually
loading the preset but doesn't notify the changes to AutomationControls.

Since the input_controls vector now contains all ControlUI's that rely on
AutomationControls to get updates, just listen to Plugin::PresetLoaded()
and trigger an update of all elements in input_controls.

This is temporary until a better solution is devised to make
AutomationControls aware of preset loading.
This commit is contained in:
Julien "_FrnchFrgg_" RIVAUD
2016-07-29 02:06:55 +02:00
parent 7e30161dc0
commit 67cbdc6cf2
2 changed files with 19 additions and 1 deletions

View File

@@ -315,6 +315,9 @@ GenericPluginUI::build ()
automation_play_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Play));
automation_write_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Write));
automation_touch_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Touch));
/* XXX This is a workaround for AutomationControl not knowing about preset loads */
plugin->PresetLoaded.connect (*this, invalidator (*this), boost::bind (&GenericPluginUI::update_input_displays, this), gui_context ());
}
@@ -847,6 +850,8 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param,
automation_state_changed (control_ui);
/* Add to the list of CUIs that need manual update to workaround
* AutomationControl not knowing about preset loads */
input_controls.push_back (control_ui);
} else {
@@ -1013,6 +1018,18 @@ GenericPluginUI::update_control_display (ControlUI* cui)
}*/
}
void
GenericPluginUI::update_input_displays ()
{
/* XXX This is a workaround for AutomationControl not knowing about preset loads */
for (vector<ControlUI*>::iterator i = input_controls.begin();
i != input_controls.end();
++i) {
update_control_display(*i);
}
return;
}
void
GenericPluginUI::control_combo_changed (ControlUI* cui, float value)
{

View File

@@ -260,7 +260,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
int x0, x1, y0, y1;
};
std::vector<ControlUI*> input_controls;
std::vector<ControlUI*> input_controls; // workaround for preset load
std::vector<ControlUI*> input_controls_with_automation;
std::vector<ControlUI*> output_controls;
@@ -281,6 +281,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
void ui_parameter_changed (ControlUI* cui);
void update_control_display (ControlUI* cui);
void update_input_displays (); // workaround for preset load
void control_combo_changed (ControlUI* cui, float value);
void astate_clicked (ControlUI*);