X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flv2_plugin_ui.cc;h=dec02a7ebc7b813143db229daa53b269158437ac;hb=ffc50fcf9da9f98ce2f261cffc2a01be20af32ed;hp=cd43f410f4473e883d8f0d0f65c5166a65d2441d;hpb=06e8b6452dd458cee1ad0e53046a12923cf294e9;p=ardour.git

diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc
index cd43f410f4..dec02a7ebc 100644
--- a/gtk2_ardour/lv2_plugin_ui.cc
+++ b/gtk2_ardour/lv2_plugin_ui.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2008-2011 Paul Davis
+    Copyright (C) 2008-2012 Paul Davis
     Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify
@@ -15,7 +15,6 @@
     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.
-
 */
 
 #include "ardour/lv2_plugin.h"
@@ -28,29 +27,60 @@
 
 #include "lv2_ui.h"
 
-using namespace Gtk;
+#include <lilv/lilv.h>
+#include <suil/suil.h>
+
 using namespace ARDOUR;
+using namespace Gtk;
 using namespace PBD;
 
-#if defined(HAVE_NEW_SLV2) && defined(HAVE_SUIL)
-SuilHost* LV2PluginUI::ui_host = NULL;
-#endif
+#define NS_UI "http://lv2plug.in/ns/extensions/ui#"
+
+static SuilHost* ui_host = NULL;
 
 void
-LV2PluginUI::lv2_ui_write(void*       controller,
-                          uint32_t    port_index,
-                          uint32_t    /*buffer_size*/,
-                          uint32_t    /*format*/,
-                          const void* buffer)
+LV2PluginUI::write_from_ui(void*       controller,
+                           uint32_t    port_index,
+                           uint32_t    buffer_size,
+                           uint32_t    format,
+                           const void* buffer)
 {
 	LV2PluginUI* me = (LV2PluginUI*)controller;
-	boost::shared_ptr<AutomationControl> ac = me->_controllables[port_index];
+	if (format == 0) {
+		if (port_index >= me->_controllables.size()) {
+			return;
+		}
 
-	if (ac) {
-		ac->set_value(*(float*)buffer);
+		boost::shared_ptr<AutomationControl> ac = me->_controllables[port_index];
+		if (ac) {
+			ac->set_value(*(float*)buffer);
+		}
+	} else if (format == me->_lv2->atom_eventTransfer()) {
+		me->_lv2->write_from_ui(port_index, format, buffer_size, (uint8_t*)buffer);
 	}
 }
 
+void
+LV2PluginUI::write_to_ui(void*       controller,
+                         uint32_t    port_index,
+                         uint32_t    buffer_size,
+                         uint32_t    format,
+                         const void* buffer)
+{
+	LV2PluginUI* me = (LV2PluginUI*)controller;
+
+	if (me->_inst) {
+		suil_instance_port_event((SuilInstance*)me->_inst,
+					 port_index, buffer_size, format, buffer);
+	}
+}
+
+void
+LV2PluginUI::update_timeout()
+{
+	_lv2->emit_to_ui(this, &LV2PluginUI::write_to_ui);
+}
+
 void
 LV2PluginUI::on_external_ui_closed(void* controller)
 {
@@ -76,15 +106,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
-	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;
 }
 
@@ -104,8 +126,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;
@@ -132,13 +153,12 @@ LV2PluginUI::LV2PluginUI(boost::shared_ptr<PluginInsert> pi,
                          boost::shared_ptr<LV2Plugin>    lv2p)
 	: PlugUIBase(pi)
 	, _lv2(lv2p)
+	, _gui_widget(NULL)
+	, _ardour_buttons_box(NULL)
 	, _values(NULL)
 	, _external_ui_ptr(NULL)
 	, _inst(NULL)
 {
-	if (!_lv2->is_external_ui()) {
-		lv2ui_instantiate("gtk2gui");
-	}
 }
 
 void
@@ -175,42 +195,32 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
 		features_dst = (LV2_Feature**)_lv2->features();
 	}
 
-#if defined(HAVE_NEW_SLV2) && defined(HAVE_SUIL)
-	if (!LV2PluginUI::ui_host) {
-		LV2PluginUI::ui_host = suil_host_new(
-	        LV2PluginUI::lv2_ui_write, NULL, NULL, NULL);
+	if (!ui_host) {
+		ui_host = suil_host_new(LV2PluginUI::write_from_ui, NULL, NULL, NULL);
 	}
-	LV2World* lv2_world      = ARDOUR::PluginManager::the_manager()->lv2_world();
-	SLV2Value container_type = (is_external_ui)
-		? lv2_world->external_gui : lv2_world->gtk_gui;
-	SLV2UI ui = _lv2->slv2_ui();
+	const char* container_type = (is_external_ui)
+		? NS_UI "external"
+		: NS_UI "GtkUI";
+
+	LilvUI* ui = (LilvUI*)_lv2->c_ui();
 	_inst = suil_instance_new(
-		LV2PluginUI::ui_host,
+		ui_host,
 		this,
-		slv2_value_as_uri(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))),
+		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);
-#endif
 
 	if (is_external_ui) {
 		free(features_dst);
 	}
 
-#if defined(HAVE_NEW_SLV2) && defined(HAVE_SUIL)
-#define GET_WIDGET(inst) suil_instance_get_widget(inst);
-#else
-#define GET_WIDGET(inst) slv2_ui_instance_get_widget(inst);
-#endif
+#define GET_WIDGET(inst) suil_instance_get_widget((SuilInstance*)inst);
 
-	uint32_t num_ports = slv2_plugin_get_num_ports(_lv2->slv2_plugin());
+	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)
@@ -222,6 +232,18 @@ 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->show_all();
+			pack_start(*_ardour_buttons_box, false, false);
+
 			GtkWidget* c_widget = (GtkWidget*)GET_WIDGET(_inst);
 			_gui_widget = Glib::wrap(c_widget);
 			_gui_widget->show_all();
@@ -246,27 +268,43 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
 			}
 		}
 	}
+
+	if (_lv2->has_message_output()) {
+		_lv2->enable_ui_emmission();
+		ARDOUR_UI::instance()->RapidScreenUpdate.connect(
+			sigc::mem_fun(*this, &LV2PluginUI::update_timeout));
+	}
 }
 
-LV2PluginUI::~LV2PluginUI ()
+void
+LV2PluginUI::lv2ui_free()
 {
-	//cout << "LV2PluginUI destructor called" << endl;
+	stop_updating (0);
+
+	if (_gui_widget) {
+		remove (*_gui_widget);
+	}
+
+	if (_ardour_buttons_box) {
+		remove (*_ardour_buttons_box);
+		delete _ardour_buttons_box;
+		_ardour_buttons_box = 0;
+	}
+
+	suil_instance_free((SuilInstance*)_inst);
+
+	_inst = NULL;
+	_gui_widget = NULL;
+}
 
+LV2PluginUI::~LV2PluginUI ()
+{
 	if (_values) {
 		delete[] _values;
 	}
 
 	/* Close and delete GUI. */
-#if defined(HAVE_NEW_SLV2) && defined(HAVE_SUIL)
-	suil_instance_free(_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);
-	}
-#endif
+	lv2ui_free();
 
 	_screen_update_connection.disconnect();
 
@@ -292,6 +330,12 @@ LV2PluginUI::get_preferred_width()
 	return r.width;
 }
 
+bool
+LV2PluginUI::resizable()
+{
+	return _lv2->ui_is_resizable();
+}
+
 int
 LV2PluginUI::package(Gtk::Window& win)
 {
@@ -345,6 +389,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;
@@ -360,5 +406,7 @@ LV2PluginUI::on_window_hide()
 		//slv2_ui_instance_get_descriptor(_inst)->cleanup(_inst);
 		//_external_ui_ptr = NULL;
 		//_screen_update_connection.disconnect();
+	} else {
+		lv2ui_free();
 	}
 }