avoid use of Port::port_offset() everywhere except Port::flush_buffers() and Port...

[ardour.git] / gtk2_ardour / lv2_plugin_ui.cc

diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc
index f83adef40704e436344e1414ae63257f34f878eb..7f37b8c8ca037687a8ad506ea5b1cd6a09b498a7 100644 (file)
--- a/gtk2_ardour/lv2_plugin_ui.cc
+++ b/gtk2_ardour/lv2_plugin_ui.cc
@@ -1,21 +1,23 @@
 /*
-    Copyright (C) 2008-2012 Paul Davis
-    Author: David Robillard
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+ * Copyright (C) 2008-2017 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2008-2018 David Robillard <d@drobilla.net>
+ * Copyright (C) 2009-2012 Carl Hetherington <carl@carlh.net>
+ * Copyright (C) 2012-2018 Robin Gareus <robin@gareus.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <gtkmm/stock.h>
 
@@ -144,20 +146,6 @@ LV2PluginUI::request_parameter (void* handle, LV2_URID key)
                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 */
        }
@@ -186,8 +174,6 @@ LV2PluginUI::request_parameter (void* handle, LV2_URID key)
        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
@@ -319,6 +305,9 @@ LV2PluginUI::LV2PluginUI(boost::shared_ptr<PluginInsert> pi,
        if (pi->controls().size() > 0) {
                _ardour_buttons_box.pack_end (reset_button, false, false, 4);
        }
+       if (has_descriptive_presets ()) {
+               _ardour_buttons_box.pack_end (preset_browser_button, false, false);
+       }
        _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);
@@ -408,13 +397,8 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
        const LilvUI*   ui     = (const LilvUI*)_lv2->c_ui();
        const LilvNode* bundle = lilv_ui_get_bundle_uri(ui);
        const LilvNode* binary = lilv_ui_get_binary_uri(ui);
-#ifdef HAVE_LILV_0_21_3
        char* ui_bundle_path = lilv_file_uri_parse(lilv_node_as_uri(bundle), NULL);
        char* ui_binary_path = lilv_file_uri_parse(lilv_node_as_uri(binary), NULL);
-#else
-       char* ui_bundle_path = strdup(lilv_uri_to_path(lilv_node_as_uri(bundle)));
-       char* ui_binary_path = strdup(lilv_uri_to_path(lilv_node_as_uri(binary)));
-#endif
        if (!ui_bundle_path || !ui_binary_path) {
                error << _("failed to get path for UI bindle or binary") << endmsg;
                free(ui_bundle_path);