#include "gui_thread.h"
#include "lv2_plugin_ui.h"
+#include "lv2_ui.h"
+
+/* Note this file is not compiled without either Suil or SLV2 present,
+ and if Suil is present then Lilv is also present.
+*/
+
+#ifdef HAVE_SUIL
+#include <lilv/lilv.h>
+#include <suil/suil.h>
+#else
+#include <slv2/slv2.h>
+#endif
+
using namespace Gtk;
using namespace ARDOUR;
using namespace PBD;
-#ifdef HAVE_NEW_SLV2
-SLV2UIHost LV2PluginUI::ui_host = NULL;
-SLV2Value LV2PluginUI::ui_GtkUI = NULL;
+#define NS_UI "http://lv2plug.in/ns/extensions/ui#"
+
+#ifdef HAVE_SUIL
+static SuilHost* ui_host = NULL;
#endif
void
-LV2PluginUI::lv2_ui_write(LV2UI_Controller controller,
- uint32_t port_index,
- uint32_t /*buffer_size*/,
- uint32_t /*format*/,
- const void* buffer)
+LV2PluginUI::lv2_ui_write(void* controller,
+ uint32_t port_index,
+ uint32_t /*buffer_size*/,
+ uint32_t /*format*/,
+ const void* buffer)
{
LV2PluginUI* me = (LV2PluginUI*)controller;
- me->_controllables[port_index]->set_value(*(float*)buffer);
+ boost::shared_ptr<AutomationControl> ac = me->_controllables[port_index];
+
+ if (ac) {
+ ac->set_value(*(float*)buffer);
+ }
}
void
-LV2PluginUI::on_external_ui_closed(LV2UI_Controller controller)
+LV2PluginUI::on_external_ui_closed(void* controller)
{
LV2PluginUI* me = (LV2PluginUI*)controller;
me->_screen_update_connection.disconnect();
return;
}
-#ifdef HAVE_NEW_SLV2
- slv2_ui_instance_port_event(_inst, port_index, 4, 0, &val);
+#ifdef HAVE_SUIL
+ suil_instance_port_event((SuilInstance*)_inst, port_index, 4, 0, &val);
#else
- const LV2UI_Descriptor* ui_desc = slv2_ui_instance_get_descriptor(_inst);
- LV2UI_Handle ui_handle = slv2_ui_instance_get_handle(_inst);
+ 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);
}
{
//cout << "stop_updating" << endl;
- if ( //!_external_ui_ptr &&
- !_output_ports.empty()) {
+ if (!_output_ports.empty()) {
_screen_update_connection.disconnect();
}
return false;
boost::shared_ptr<LV2Plugin> lv2p)
: PlugUIBase(pi)
, _lv2(lv2p)
- , _inst(NULL)
+ , _gui_widget(NULL)
, _values(NULL)
, _external_ui_ptr(NULL)
+ , _inst(NULL)
{
- if (!_lv2->is_external_ui()) {
- lv2ui_instantiate("gtk2gui");
- }
}
void
features_dst = (LV2_Feature**)_lv2->features();
}
-#ifdef HAVE_NEW_SLV2
- if (!LV2PluginUI::ui_host) {
- LV2PluginUI::ui_GtkUI = slv2_value_new_uri(
- ARDOUR::PluginManager::the_manager()->lv2_world()->world,
- "http://lv2plug.in/ns/extensions/ui#GtkUI");
- LV2PluginUI::ui_host = slv2_ui_host_new(
- LV2PluginUI::lv2_ui_write, NULL, NULL, NULL);
+#ifdef HAVE_SUIL
+ if (!ui_host) {
+ ui_host = suil_host_new(LV2PluginUI::lv2_ui_write, NULL, NULL, NULL);
}
- _inst = slv2_ui_instance_new(
- _lv2->slv2_plugin(), _lv2->slv2_ui(), ui_GtkUI, ui_host, this, features_dst);
+ const char* container_type = (is_external_ui)
+ ? NS_UI "external"
+ : NS_UI "GtkUI";
+
+ LilvUI* ui = (LilvUI*)_lv2->c_ui();
+ _inst = suil_instance_new(
+ ui_host,
+ this,
+ container_type,
+ _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(
- _lv2->slv2_plugin(), _lv2->slv2_ui(), LV2PluginUI::lv2_ui_write, this,
- features_dst);
+ _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);
}
- uint32_t num_ports = slv2_plugin_get_num_ports(_lv2->slv2_plugin());
+#ifdef 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) {
if (_lv2->parameter_is_output(i)
&& _lv2->parameter_is_control(i)
_external_ui_ptr = NULL;
if (_inst) {
if (!is_external_ui) {
- GtkWidget* c_widget = (GtkWidget*)slv2_ui_instance_get_widget(_inst);
+ GtkWidget* c_widget = (GtkWidget*)GET_WIDGET(_inst);
_gui_widget = Glib::wrap(c_widget);
_gui_widget->show_all();
pack_start(*_gui_widget, true, true);
} else {
- _external_ui_ptr = (struct lv2_external_ui*)slv2_ui_instance_get_widget(_inst);
+ _external_ui_ptr = (struct lv2_external_ui*)GET_WIDGET(_inst);
}
}
}
}
-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. */
-#ifdef HAVE_NEW_SLV2
- slv2_ui_instance_free(_inst);
+#ifdef HAVE_SUIL
+ suil_instance_free((SuilInstance*)_inst);
#else
- 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);
+ SLV2UIInstance inst = (SLV2UIInstance)_inst;
+ if (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);
+ }
}
#endif
+ _inst = NULL;
+ _gui_widget = NULL;
+}
+
+LV2PluginUI::~LV2PluginUI ()
+{
+ if (_values) {
+ delete[] _values;
+ }
+
+ /* Close and delete GUI. */
+ lv2ui_free();
+
_screen_update_connection.disconnect();
if (_lv2->is_external_ui()) {
_screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect
(sigc::mem_fun(*this, &LV2PluginUI::output_update));
return false;
+ } else {
+ lv2ui_instantiate("gtk2gui");
}
return true;
//slv2_ui_instance_get_descriptor(_inst)->cleanup(_inst);
//_external_ui_ptr = NULL;
//_screen_update_connection.disconnect();
+ } else {
+ lv2ui_free();
}
}
projects / ardour.git / blobdiff