Use a button in the processor box for toggle parameters.

[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 30e622fe1ec2d049f690b500efd030daee19c5df..785a6b9721a87d32b2f042a3ffa0a48c9beb5b5f 100644 (file)
--- a/gtk2_ardour/lv2_plugin_ui.cc
+++ b/gtk2_ardour/lv2_plugin_ui.cc
@@ -28,11 +28,8 @@
 
 #include "lv2_ui.h"
 
-#include <slv2/slv2.h>
-
-#if defined(HAVE_NEW_SLV2) && defined(HAVE_SUIL)
+#include <lilv/lilv.h>
 #include <suil/suil.h>
-#endif
 
 using namespace Gtk;
 using namespace ARDOUR;
@@ -40,9 +37,7 @@ using namespace PBD;
 
 #define NS_UI "http://lv2plug.in/ns/extensions/ui#"
 
-#if defined(HAVE_NEW_SLV2) && defined(HAVE_SUIL)
 static SuilHost* ui_host = NULL;
-#endif
 
 void
 LV2PluginUI::lv2_ui_write(void*       controller,
@@ -84,16 +79,7 @@ LV2PluginUI::parameter_update(uint32_t port_index, float val)
                return;
        }
 
-#ifdef HAVE_SUIL
-       suil_instance_port_event(_inst, port_index, 4, 0, &val);
-#else
-       SLV2UIInstance          inst      = (SLV2UIInstance)_inst;
-       const LV2UI_Descriptor* ui_desc   = slv2_ui_instance_get_descriptor(inst);
-       LV2UI_Handle            ui_handle = slv2_ui_instance_get_handle(inst);
-       if (ui_desc->port_event) {
-               ui_desc->port_event(ui_handle, port_index, 4, 0, &val);
-       }
-#endif
+       suil_instance_port_event((SuilInstance*)_inst, port_index, 4, 0, &val);
        _values[port_index] = val;
 }
 
@@ -113,8 +99,7 @@ LV2PluginUI::stop_updating(GdkEventAny*)
 {
        //cout << "stop_updating" << endl;
 
-       if ( //!_external_ui_ptr &&
-           !_output_ports.empty()) {
+       if (!_output_ports.empty()) {
                _screen_update_connection.disconnect();
        }
        return false;
@@ -141,13 +126,11 @@ LV2PluginUI::LV2PluginUI(boost::shared_ptr<PluginInsert> pi,
                          boost::shared_ptr<LV2Plugin>    lv2p)
        : PlugUIBase(pi)
        , _lv2(lv2p)
+       , _gui_widget(NULL)
        , _values(NULL)
        , _external_ui_ptr(NULL)
        , _inst(NULL)
 {
-       if (!_lv2->is_external_ui()) {
-               lv2ui_instantiate("gtk2gui");
-       }
 }
 
 void
@@ -184,7 +167,6 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
                features_dst = (LV2_Feature**)_lv2->features();
        }
 
-#if defined(HAVE_NEW_SLV2) && defined(HAVE_SUIL)
        if (!ui_host) {
                ui_host = suil_host_new(LV2PluginUI::lv2_ui_write, NULL, NULL, NULL);
        }
@@ -192,34 +174,23 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
                ? NS_UI "external"
                : NS_UI "GtkUI";
 
-       SLV2UI ui = _lv2->slv2_ui();
+       LilvUI* ui = (LilvUI*)_lv2->c_ui();
        _inst = suil_instance_new(
                ui_host,
                this,
                container_type,
-               slv2_value_as_uri(slv2_plugin_get_uri(_lv2->slv2_plugin())),
-               slv2_value_as_uri(slv2_ui_get_uri(ui)),
-               slv2_value_as_uri(_lv2->ui_type()),
-               slv2_uri_to_path(slv2_value_as_uri(slv2_ui_get_bundle_uri(ui))),
-               slv2_uri_to_path(slv2_value_as_uri(slv2_ui_get_binary_uri(ui))),
+               _lv2->uri(),
+               lilv_node_as_uri(lilv_ui_get_uri(ui)),
+               lilv_node_as_uri((const LilvNode*)_lv2->c_ui_type()),
+               lilv_uri_to_path(lilv_node_as_uri(lilv_ui_get_bundle_uri(ui))),
+               lilv_uri_to_path(lilv_node_as_uri(lilv_ui_get_binary_uri(ui))),
                features_dst);
-#else
-       _inst = slv2_ui_instantiate((SLV2Plugin)_lv2->c_plugin(),
-                                   (SLV2UI)_lv2->c_ui(),
-                                   LV2PluginUI::lv2_ui_write,
-                                   this,
-                                   features_dst);
-#endif
 
        if (is_external_ui) {
                free(features_dst);
        }
 
-#if defined(HAVE_NEW_SLV2) && defined(HAVE_SUIL)
 #define GET_WIDGET(inst) suil_instance_get_widget((SuilInstance*)inst);
-#else
-#define GET_WIDGET(inst) slv2_ui_instance_get_widget((SLV2UIInstance)inst);
-#endif
 
        const uint32_t num_ports = _lv2->num_ports();
        for (uint32_t i = 0; i < num_ports; ++i) {
@@ -233,6 +204,18 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
        _external_ui_ptr = NULL;
        if (_inst) {
                if (!is_external_ui) {
+                       Gtk::HBox* box = manage (new Gtk::HBox);
+                       box->set_spacing (6);
+                       box->set_border_width (6);
+                       box->pack_end (focus_button, false, false);
+                       box->pack_end (bypass_button, false, false, 10);
+                       box->pack_end (delete_button, false, false);
+                       box->pack_end (save_button, false, false);
+                       box->pack_end (add_button, false, false);
+                       box->pack_end (_preset_combo, false, false);
+                       box->show_all();
+                       pack_start(*box, false, false);
+
                        GtkWidget* c_widget = (GtkWidget*)GET_WIDGET(_inst);
                        _gui_widget = Glib::wrap(c_widget);
                        _gui_widget->show_all();
@@ -259,26 +242,29 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
        }
 }
 
-LV2PluginUI::~LV2PluginUI ()
+void
+LV2PluginUI::lv2ui_free()
 {
-       //cout << "LV2PluginUI destructor called" << endl;
+       stop_updating (0);
 
-       if (_values) {
-               delete[] _values;
+       if (_gui_widget) {
+               remove (*_gui_widget);
        }
 
-       /* Close and delete GUI. */
-#if defined(HAVE_NEW_SLV2) && defined(HAVE_SUIL)
        suil_instance_free((SuilInstance*)_inst);
-#else
-       SLV2UIInstance          inst      = (SLV2UIInstance)_inst;
-       const LV2UI_Descriptor* ui_desc   = slv2_ui_instance_get_descriptor(inst);
-       LV2UI_Handle            ui_handle = slv2_ui_instance_get_handle(inst);
 
-       if (ui_desc) {
-               ui_desc->cleanup(ui_handle);
+       _inst = NULL;
+       _gui_widget = NULL;
+}
+
+LV2PluginUI::~LV2PluginUI ()
+{
+       if (_values) {
+               delete[] _values;
        }
-#endif
+
+       /* Close and delete GUI. */
+       lv2ui_free();
 
        _screen_update_connection.disconnect();
 
@@ -357,6 +343,8 @@ LV2PluginUI::on_window_show(const std::string& title)
                _screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect
                        (sigc::mem_fun(*this, &LV2PluginUI::output_update));
                return false;
+       } else {
+               lv2ui_instantiate("gtk2gui");
        }
 
        return true;
@@ -372,5 +360,7 @@ LV2PluginUI::on_window_hide()
                //slv2_ui_instance_get_descriptor(_inst)->cleanup(_inst);
                //_external_ui_ptr = NULL;
                //_screen_update_connection.disconnect();
+       } else {
+               lv2ui_free();
        }
 }