Create and realize LV2 UI container before instantiating (required for proper embeddi...

git-svn-id: svn://localhost/ardour2/branches/3.0@13140 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc
index f127256f1b295cfa9200de13b8d9850c1d26c007..0c4ea8f0d9b74521771e32ae73f371965a904a56 100644 (file)
--- a/gtk2_ardour/lv2_plugin_ui.cc
+++ b/gtk2_ardour/lv2_plugin_ui.cc
@@ -54,10 +54,11 @@ LV2PluginUI::write_from_ui(void*       controller,
 
                boost::shared_ptr<AutomationControl> ac = me->_controllables[port_index];
                if (ac) {
-                       ac->set_value(*(float*)buffer);
+                       ac->set_value(*(const float*)buffer);
                }
        } else if (format == me->_lv2->atom_eventTransfer()) {
-               me->_lv2->write_from_ui(port_index, format, buffer_size, (uint8_t*)buffer);
+               me->_lv2->write_from_ui(port_index, format, buffer_size,
+                                       (const uint8_t*)buffer);
        }
 }
 
@@ -188,14 +189,15 @@ LV2PluginUI::LV2PluginUI(boost::shared_ptr<PluginInsert> pi,
 void
 LV2PluginUI::lv2ui_instantiate(const std::string& title)
 {
-       LV2_Feature** features;
-       LV2_Feature** features_src;
-       LV2_Feature** features_dst;
-       size_t        features_count;
-       bool          is_external_ui;
-
-       is_external_ui = _lv2->is_external_ui();
+       bool          is_external_ui = _lv2->is_external_ui();
+       LV2_Feature** features_src   = const_cast<LV2_Feature**>(_lv2->features());
+       LV2_Feature** features       = const_cast<LV2_Feature**>(_lv2->features());
+       size_t        features_count = 0;
+       while (*features++) {
+               features_count++;
+       }
 
+       Gtk::Alignment* container = NULL;
        if (is_external_ui) {
                _external_ui_host.ui_closed       = LV2PluginUI::on_external_ui_closed;
                _external_ui_host.plugin_human_id = strdup(title.c_str());
@@ -203,20 +205,43 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
                _external_ui_feature.URI  = LV2_EXTERNAL_UI_URI;
                _external_ui_feature.data = &_external_ui_host;
 
-               features_src = features = const_cast<LV2_Feature**>(_lv2->features());
-               features_count = 2;
-               while (*features++) {
-                       features_count++;
-               }
-               features_dst = features = (LV2_Feature**)malloc(
-                       sizeof(LV2_Feature*) * features_count);
-               features_dst[--features_count] = NULL;
-               features_dst[--features_count] = &_external_ui_feature;
-               while (features_count--) {
-                       *features++ = *features_src++;
+               ++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] = &_external_ui_feature;
+               features[features_count]     = NULL;
        } else {
-               features_dst = const_cast<LV2_Feature**>(_lv2->features());
+               _ardour_buttons_box = manage (new Gtk::HBox);
+               _ardour_buttons_box->set_spacing (6);
+               _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, 10);
+               _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->show_all();
+               pack_start(*_ardour_buttons_box, false, false);
+
+               _gui_widget = Gtk::manage((container = new Gtk::Alignment()));
+               pack_start(*_gui_widget, true, true);
+               _gui_widget->show();
+
+               _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;
        }
 
        if (!ui_host) {
@@ -229,7 +254,7 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
                ? NS_UI "external"
                : NS_UI "GtkUI";
 
-       LilvUI* ui = (LilvUI*)_lv2->c_ui();
+       const LilvUI* ui = (const LilvUI*)_lv2->c_ui();
        _inst = suil_instance_new(
                ui_host,
                this,
@@ -239,11 +264,9 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
                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);
+               features);
 
-       if (is_external_ui) {
-               free(features_dst);
-       }
+       free(features);
 
 #define GET_WIDGET(inst) suil_instance_get_widget((SuilInstance*)inst);
 
@@ -259,19 +282,6 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
        _external_ui_ptr = NULL;
        if (_inst) {
                if (!is_external_ui) {
-                       _ardour_buttons_box = manage (new Gtk::HBox);
-                       _ardour_buttons_box->set_spacing (6);
-                       _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, 10);
-                       _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->show_all();
-                       pack_start(*_ardour_buttons_box, false, false);
-
                        GtkWidget* c_widget = (GtkWidget*)GET_WIDGET(_inst);
                        if (!c_widget) {
                                error << _("failed to get LV2 UI widget") << endmsg;
@@ -279,9 +289,11 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
                                _inst = NULL;
                                return;
                        }
-                       _gui_widget = Gtk::manage(Glib::wrap(c_widget));
-                       _gui_widget->show_all();
-                       pack_start(*_gui_widget, true, true);
+                       if (!container->get_child()) {
+                               // Suil didn't add the UI to the container for us, so do it now
+                               container->add(*Gtk::manage(Glib::wrap(c_widget)));
+                       }
+                       container->show_all();
                } else {
                        _external_ui_ptr = (struct lv2_external_ui*)GET_WIDGET(_inst);
                }

diff --git a/gtk2_ardour/lv2_plugin_ui.h b/gtk2_ardour/lv2_plugin_ui.h
index a98921314611cfde0c0ce929f8550b837153b90c..b941d613bcbfdbbfd7b4d92953925067207d49e3 100644 (file)
--- a/gtk2_ardour/lv2_plugin_ui.h
+++ b/gtk2_ardour/lv2_plugin_ui.h
@@ -77,6 +77,7 @@ class LV2PluginUI : public PlugUIBase, public Gtk::VBox
        struct lv2_external_ui_host          _external_ui_host;
        LV2_Feature                          _external_ui_feature;
        struct lv2_external_ui*              _external_ui_ptr;
+       LV2_Feature                          _parent_feature;
        Gtk::Window*                         _win_ptr;
        void*                                _inst;
 

diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h
index cbabaa7421d6f3f90258667c6d454f48202c2839..8dacd8600ef9fd1922b460db3f138fccabf7a150 100644 (file)
--- a/libs/ardour/ardour/lv2_plugin.h
+++ b/libs/ardour/ardour/lv2_plugin.h
@@ -126,7 +126,10 @@ class LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
 
        uint32_t atom_eventTransfer() const;
 
-       void write_from_ui(uint32_t index, uint32_t protocol, uint32_t size, uint8_t* body);
+       void write_from_ui(uint32_t       index,
+                          uint32_t       protocol,
+                          uint32_t       size,
+                          const uint8_t* body);
 
        typedef void UIMessageSink(void*       controller,
                                   uint32_t    index,
@@ -195,16 +198,16 @@ class LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
                uint32_t size;
        };
 
-       void write_to_ui(uint32_t index,
-                        uint32_t protocol,
-                        uint32_t size,
-                        uint8_t* body);
+       void write_to_ui(uint32_t       index,
+                        uint32_t       protocol,
+                        uint32_t       size,
+                        const uint8_t* body);
 
        void write_to(RingBuffer<uint8_t>* dest,
                      uint32_t             index,
                      uint32_t             protocol,
                      uint32_t             size,
-                     uint8_t*             body);
+                     const uint8_t*       body);
 
        // Created on demand so the space is only consumed if necessary
        RingBuffer<uint8_t>* _to_ui;

diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index 407b77a2140a88b36c5b12145541f86f354fb2bc..7d5c88402ee6fae08acf7c7118f17d22b2d70f95 100644 (file)
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -1090,7 +1090,7 @@ LV2Plugin::write_to(RingBuffer<uint8_t>* dest,
                     uint32_t             index,
                     uint32_t             protocol,
                     uint32_t             size,
-                    uint8_t*             body)
+                    const uint8_t*       body)
 {
        const uint32_t buf_size = sizeof(UIMessage) + size;
        uint8_t        buf[buf_size];
@@ -1107,10 +1107,10 @@ LV2Plugin::write_to(RingBuffer<uint8_t>* dest,
 }
 
 void
-LV2Plugin::write_from_ui(uint32_t index,
-                         uint32_t protocol,
-                         uint32_t size,
-                         uint8_t* body)
+LV2Plugin::write_from_ui(uint32_t       index,
+                         uint32_t       protocol,
+                         uint32_t       size,
+                         const uint8_t* body)
 {
        if (!_from_ui) {
                _from_ui = new RingBuffer<uint8_t>(4096);
@@ -1120,12 +1120,11 @@ LV2Plugin::write_from_ui(uint32_t index,
 }
 
 void
-LV2Plugin::write_to_ui(uint32_t index,
-                       uint32_t protocol,
-                       uint32_t size,
-                       uint8_t* body)
+LV2Plugin::write_to_ui(uint32_t       index,
+                       uint32_t       protocol,
+                       uint32_t       size,
+                       const uint8_t* body)
 {
-       std::cerr << "WRITE TO UI" << std::endl;
        write_to(_to_ui, index, protocol, size, body);
 }
 
@@ -1465,7 +1464,7 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
                                LV2_Evbuf_Iterator    i    = lv2_evbuf_end(buf);
                                const LV2_Atom* const atom = (const LV2_Atom*)body;
                                lv2_evbuf_write(&i, nframes, 0, atom->type, atom->size,
-                                               (const uint8_t*)LV2_ATOM_BODY(atom));
+                                               (const uint8_t*)(atom + 1));
                        } else {
                                error << "Received unknown message type from UI" << endmsg;
                        }