X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flv2_plugin_ui.cc;h=ec1f1323d5b48f606efb5b491acf7437679e10fe;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=467a3062b25c76e0b95e70a66bbf0fab9aa759ac;hpb=395ba6b0d4d612d2b606a2d3e894d0d2c19ec85d;p=ardour.git diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc index 467a3062b2..ec1f1323d5 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,55 +15,96 @@ 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" #include "ardour/plugin_manager.h" #include "ardour/processor.h" +#include "ardour/session.h" #include "ardour_ui.h" #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. -*/ +#include "lv2/lv2plug.in/ns/extensions/ui/ui.h" -#ifdef HAVE_SUIL #include #include -#else -#include -#endif -using namespace Gtk; using namespace ARDOUR; +using namespace Gtk; using namespace PBD; #define NS_UI "http://lv2plug.in/ns/extensions/ui#" -#ifdef HAVE_SUIL static SuilHost* ui_host = NULL; -#endif 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 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 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); + } +} + +uint32_t +LV2PluginUI::port_index(void* controller, const char* symbol) +{ + return ((LV2PluginUI*)controller)->_lv2->port_index(symbol); +} + +void +LV2PluginUI::touch(void* controller, + uint32_t port_index, + bool grabbed) +{ + LV2PluginUI* me = (LV2PluginUI*)controller; + if (port_index >= me->_controllables.size()) { + return; + } + + ControllableRef control = me->_controllables[port_index]; + if (grabbed) { + control->start_touch(control->session().transport_frame()); + } else { + control->stop_touch(false, control->session().transport_frame()); + } +} + +void +LV2PluginUI::update_timeout() +{ + _lv2->emit_to_ui(this, &LV2PluginUI::write_to_ui); +} + void LV2PluginUI::on_external_ui_closed(void* controller) { @@ -89,16 +130,7 @@ LV2PluginUI::parameter_update(uint32_t port_index, float val) return; } -#ifdef HAVE_SUIL suil_instance_port_event((SuilInstance*)_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 _values[port_index] = val; } @@ -146,6 +178,7 @@ LV2PluginUI::LV2PluginUI(boost::shared_ptr pi, : PlugUIBase(pi) , _lv2(lv2p) , _gui_widget(NULL) + , _ardour_buttons_box(NULL) , _values(NULL) , _external_ui_ptr(NULL) , _inst(NULL) @@ -186,9 +219,11 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title) features_dst = (LV2_Feature**)_lv2->features(); } -#ifdef HAVE_SUIL if (!ui_host) { - ui_host = suil_host_new(LV2PluginUI::lv2_ui_write, NULL, NULL, NULL); + ui_host = suil_host_new(LV2PluginUI::write_from_ui, + LV2PluginUI::port_index, + NULL, NULL); + suil_host_set_touch_func(ui_host, LV2PluginUI::touch); } const char* container_type = (is_external_ui) ? NS_UI "external" @@ -205,23 +240,12 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title) 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); } -#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) { @@ -235,8 +259,20 @@ 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 = Gtk::manage(Glib::wrap(c_widget)); _gui_widget->show_all(); pack_start(*_gui_widget, true, true); } else { @@ -259,44 +295,32 @@ 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)); + } } void LV2PluginUI::lv2ui_free() { - stop_updating(NULL); + stop_updating (0); if (_gui_widget) { remove (*_gui_widget); + _gui_widget = NULL; } -#ifdef HAVE_SUIL - std::cerr << "Calling suil_instance_free() to clean up " - << (_lv2->is_external_ui() ? " external " : " internal ") - << "UI\n"; - 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); - - std::cerr << "Calling ui descriptor cleanup on " << ui_desc << " to clean up " - << (_lv2->is_external_ui() ? " external " : " internal ") - << "UI\n"; - - if (ui_desc) { - ui_desc->cleanup(ui_handle); + if (_inst) { + suil_instance_free((SuilInstance*)_inst); + _inst = NULL; } -#endif - - _inst = NULL; - _gui_widget = NULL; } LV2PluginUI::~LV2PluginUI () { - std::cerr << "LV2PluginUI destructor called" << std::endl; - if (_values) { delete[] _values; } @@ -328,6 +352,12 @@ LV2PluginUI::get_preferred_width() return r.width; } +bool +LV2PluginUI::resizable() +{ + return _lv2->ui_is_resizable(); +} + int LV2PluginUI::package(Gtk::Window& win) {