X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flv2_plugin_ui.cc;h=f83adef40704e436344e1414ae63257f34f878eb;hb=d6b5c23579dc02d2f98fc1f48bf038c1070057fb;hp=141f437f4cdadbc21c7d8fcc4fc2ab179e9ed454;hpb=ebe15849d41c6cfa6a2ca889dabd5aef39981bae;p=ardour.git diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc index 141f437f4c..f83adef407 100644 --- a/gtk2_ardour/lv2_plugin_ui.cc +++ b/gtk2_ardour/lv2_plugin_ui.cc @@ -17,19 +17,25 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include + #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" +#include "gtkmm2ext/utils.h" + #include "lv2/lv2plug.in/ns/extensions/ui/ui.h" #include #include -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace Gtk; @@ -53,8 +59,11 @@ LV2PluginUI::write_from_ui(void* controller, } boost::shared_ptr ac = me->_controllables[port_index]; + + me->_updates.insert (port_index); + if (ac) { - ac->set_value(*(const float*)buffer); + ac->set_value(*(const float*)buffer, Controllable::NoGroup); } } else if (format == URIMap::instance().urids.atom_eventTransfer) { @@ -95,13 +104,90 @@ LV2PluginUI::touch(void* controller, if (port_index >= me->_controllables.size()) { return; } + if (!me->_lv2->parameter_is_control(port_index) || !me->_lv2->parameter_is_input(port_index)) { + return; + } ControllableRef control = me->_controllables[port_index]; if (grabbed) { - control->start_touch(control->session().transport_frame()); + control->start_touch(control->session().transport_sample()); } else { - control->stop_touch(false, control->session().transport_frame()); + control->stop_touch(control->session().transport_sample()); + } +} + +void +LV2PluginUI::set_path_property (int response, + const ParameterDescriptor& desc, + Gtk::FileChooserDialog* widget) +{ + if (response == Gtk::RESPONSE_ACCEPT) { + plugin->set_property (desc.key, Variant (Variant::PATH, widget->get_filename())); + } +#if 0 + widget->hide (); + delete_when_idle (widget); +#else + delete widget; +#endif + active_parameter_requests.erase (desc.key); +} + +uint32_t +LV2PluginUI::request_parameter (void* handle, LV2_URID key) +{ + LV2PluginUI* me = (LV2PluginUI*)handle; + + /* This will return `PropertyDescriptors nothing` when not found */ + const ParameterDescriptor& desc (me->_lv2->get_property_descriptor(key)); + if (desc.datatype != Variant::PATH) { + return 0; + } + +#if 0 // MODAL, blocking + + Gtk::FileChooserDialog* lv2ui_file_dialog (desc.label, FILE_CHOOSER_ACTION_OPEN); + Gtkmm2ext::add_volume_shortcuts (lv2ui_file_dialog); + lv2ui_file_dialog.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); + lv2ui_file_dialog.add_button (Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT); + lv2ui_file_dialog.set_default_response(Gtk::RESPONSE_ACCEPT); + if (_file_dialog.run()= Gtk::RESPONSE_ACCEPT) { + me->plugin->set_property (desc.key, Variant(Variant::PATH, lv2ui_file_dialog.get_filename())); + } + return 0; + +#else + + if (me->active_parameter_requests.find (key) != me->active_parameter_requests.end()) { + return 0; /* already showing dialog */ + } + me->active_parameter_requests.insert (key); + + Gtk::FileChooserDialog* lv2ui_file_dialog = new Gtk::FileChooserDialog(desc.label, FILE_CHOOSER_ACTION_OPEN); + Gtkmm2ext::add_volume_shortcuts (*lv2ui_file_dialog); + lv2ui_file_dialog->add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); + lv2ui_file_dialog->add_button (Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT); + lv2ui_file_dialog->set_default_response(Gtk::RESPONSE_ACCEPT); + + /* this assumes announce_property_values() was called, or + * the plugin has previously sent a patch:Set */ + const Variant& value = me->_lv2->get_property_value (desc.key); + if (value.type() == Variant::PATH) { + lv2ui_file_dialog->set_filename (value.get_path()); } + +#if 0 // TODO mime-type, file-extension filter, get from LV2 Parameter Property + FileFilter file_ext_filter; + file_ext_filter.add_pattern ("*.foo"); + file_ext_filter.set_name ("Foo File"); + lv2ui_file_dialog.add_filter (file_ext_filter); +#endif + + lv2ui_file_dialog->signal_response().connect (sigc::bind (sigc::mem_fun (*me, &LV2PluginUI::set_path_property), desc, lv2ui_file_dialog)); + lv2ui_file_dialog->present(); + return 0; + +#endif } void @@ -120,34 +206,24 @@ 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_last_sent_to_ui[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*) { - if (!_output_ports.empty()) { - _screen_update_connection.disconnect(); - _screen_update_connection = Timers::super_rapid_connect - (sigc::mem_fun(*this, &LV2PluginUI::output_update)); - } + _screen_update_connection.disconnect(); + _screen_update_connection = Timers::super_rapid_connect + (sigc::mem_fun(*this, &LV2PluginUI::output_update)); return false; } @@ -155,11 +231,21 @@ bool LV2PluginUI::stop_updating(GdkEventAny*) { //cout << "stop_updating" << endl; + _screen_update_connection.disconnect(); + return false; +} - if (!_output_ports.empty()) { - _screen_update_connection.disconnect(); +void +LV2PluginUI::queue_port_update() +{ + const uint32_t num_ports = _lv2->num_ports(); + for (uint32_t i = 0; i < num_ports; ++i) { + bool ok; + uint32_t port = _lv2->nth_parameter(i, ok); + if (ok) { + _updates.insert (port); + } } - return false; } void @@ -183,13 +269,37 @@ LV2PluginUI::output_update() } } - /* FIXME only works with control output ports (which is all we support now anyway) */ + if (!_inst) { + return; + } + + /* output ports (values set by DSP) need propagating to GUI */ + 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)); + float val = _lv2->get_parameter (index); + + if (val != _values_last_sent_to_ui[index]) { + /* Send to GUI */ + suil_instance_port_event ((SuilInstance*)_inst, index, 4, 0, &val); + /* Cache current value */ + _values_last_sent_to_ui[index] = val; + } + } + + /* Input ports marked for update because the control value changed + since the last redisplay. + */ + + 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); + _values_last_sent_to_ui[(*i)] = val; } + _updates.clear (); } LV2PluginUI::LV2PluginUI(boost::shared_ptr pi, @@ -198,7 +308,7 @@ LV2PluginUI::LV2PluginUI(boost::shared_ptr pi, , _pi(pi) , _lv2(lv2p) , _gui_widget(NULL) - , _values(NULL) + , _values_last_sent_to_ui(NULL) , _external_ui_ptr(NULL) , _inst(NULL) { @@ -206,12 +316,17 @@ LV2PluginUI::LV2PluginUI(boost::shared_ptr pi, _ardour_buttons_box.set_border_width (6); _ardour_buttons_box.pack_end (focus_button, false, false); _ardour_buttons_box.pack_end (bypass_button, false, false, 4); - _ardour_buttons_box.pack_end (reset_button, false, false, 4); + if (pi->controls().size() > 0) { + _ardour_buttons_box.pack_end (reset_button, false, false, 4); + } _ardour_buttons_box.pack_end (delete_button, false, false); _ardour_buttons_box.pack_end (save_button, false, false); _ardour_buttons_box.pack_end (add_button, false, false); _ardour_buttons_box.pack_end (_preset_combo, false, false); _ardour_buttons_box.pack_end (_preset_modified, false, false); + _ardour_buttons_box.pack_end (pin_management_button, false, false); + + plugin->PresetLoaded.connect (*this, invalidator (*this), boost::bind (&LV2PluginUI::queue_port_update, this), gui_context ()); } void @@ -222,9 +337,27 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title) LV2_Feature** features = const_cast(_lv2->features()); size_t features_count = 0; while (*features++) { - features_count++; + ++features_count; + } + + if (is_external_ui) { + features = (LV2_Feature**)malloc(sizeof(LV2_Feature*) * (features_count + 4)); + } else { + features = (LV2_Feature**)malloc(sizeof(LV2_Feature*) * (features_count + 3)); + } + + size_t fi = 0; + for (; fi < features_count; ++fi) { + features[fi] = features_src[fi]; } + _lv2ui_request_paramater.handle = this; + _lv2ui_request_paramater.request = LV2PluginUI::request_parameter; + _lv2ui_request_feature.URI = LV2_UI_PREFIX "requestParameter"; + _lv2ui_request_feature.data = &_lv2ui_request_paramater; + + features[fi++] = &_lv2ui_request_feature; + Gtk::Alignment* container = NULL; if (is_external_ui) { _external_ui_host.ui_closed = LV2PluginUI::on_external_ui_closed; @@ -236,15 +369,8 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title) _external_kxui_feature.URI = LV2_EXTERNAL_UI_KX__Host; _external_kxui_feature.data = &_external_ui_host; - ++features_count; - features = (LV2_Feature**)malloc( - sizeof(LV2_Feature*) * (features_count + 2)); - for (size_t i = 0; i < features_count - 2; ++i) { - features[i] = features_src[i]; - } - features[features_count - 2] = &_external_kxui_feature; - features[features_count - 1] = &_external_ui_feature; - features[features_count] = NULL; + features[fi++] = &_external_kxui_feature; + features[fi++] = &_external_ui_feature; } else { if (_ardour_buttons_box.get_parent()) { _ardour_buttons_box.get_parent()->remove(_ardour_buttons_box); @@ -259,16 +385,12 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title) _parent_feature.URI = LV2_UI__parent; _parent_feature.data = _gui_widget->gobj(); - ++features_count; - features = (LV2_Feature**)malloc( - sizeof(LV2_Feature*) * (features_count + 1)); - for (size_t i = 0; i < features_count - 1; ++i) { - features[i] = features_src[i]; - } - features[features_count - 1] = &_parent_feature; - features[features_count] = NULL; + features[fi++] = &_parent_feature; } + features[fi] = NULL; + assert (fi == features_count + (is_external_ui ? 3 : 2)); + if (!ui_host) { ui_host = suil_host_new(LV2PluginUI::write_from_ui, LV2PluginUI::port_index, @@ -352,19 +474,29 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title) _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); + for (uint32_t i = 0; i < num_ports; ++i) { bool ok; uint32_t port = _lv2->nth_parameter(i, ok); if (ok) { - _values[port] = _lv2->get_parameter(port); + /* Cache initial value of the parameter, regardless of + whether it is input or output + */ + + _values_last_sent_to_ui[port] = _lv2->get_parameter(port); _controllables[port] = boost::dynamic_pointer_cast ( insert->control(Evoral::Parameter(PluginAutomation, 0, port))); if (_lv2->parameter_is_control(port) && _lv2->parameter_is_input(port)) { - parameter_update(port, _values[port]); + if (_controllables[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 +533,7 @@ LV2PluginUI::lv2ui_free() LV2PluginUI::~LV2PluginUI () { - if (_values) { - delete[] _values; - } + delete [] _values_last_sent_to_ui; _message_update_connection.disconnect(); _screen_update_connection.disconnect();