X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flv2_plugin_ui.cc;h=f83adef40704e436344e1414ae63257f34f878eb;hb=HEAD;hp=7f735dfcc54f9dd479480cfa9121567370cddd6d;hpb=836f48457d443b72db2f0630f277718278735e65;p=ardour.git diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc index 7f735dfcc5..f83adef407 100644 --- a/gtk2_ardour/lv2_plugin_ui.cc +++ b/gtk2_ardour/lv2_plugin_ui.cc @@ -17,6 +17,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include + #include "ardour/lv2_plugin.h" #include "ardour/session.h" #include "pbd/error.h" @@ -26,6 +28,8 @@ #include "lv2_plugin_ui.h" #include "timers.h" +#include "gtkmm2ext/utils.h" + #include "lv2/lv2plug.in/ns/extensions/ui/ui.h" #include @@ -100,15 +104,92 @@ 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 LV2PluginUI::update_timeout() { @@ -235,7 +316,9 @@ 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); @@ -254,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; @@ -268,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); @@ -291,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,