X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flv2_plugin_ui.cc;h=641fa8dce8fa23690dc0fd2ec05a1f501eb63bfd;hb=9f9e948d845382c8f74e67034fd8beb1704bba78;hp=9634a05d0a6da72d41fc3a03bdb786e29f4051ad;hpb=47bbffc5d825c51f87955fde8ff9ca00d38d35f0;p=ardour.git

diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc
index 9634a05d0a..641fa8dce8 100644
--- a/gtk2_ardour/lv2_plugin_ui.cc
+++ b/gtk2_ardour/lv2_plugin_ui.cc
@@ -31,7 +31,7 @@
 #include <lilv/lilv.h>
 #include <suil/suil.h>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace Gtk;
@@ -55,11 +55,11 @@ LV2PluginUI::write_from_ui(void*       controller,
 		}
 
 		boost::shared_ptr<AutomationControl> ac = me->_controllables[port_index];
-		/* Cache our local copy of the last value received from the GUI */
-		me->_values[port_index] = *(const float*) buffer;
-		/* Now update the control itself */
+
+		me->_updates.insert (port_index);
+
 		if (ac) {
-			ac->set_value(*(const float*)buffer);
+			ac->set_value(*(const float*)buffer, Controllable::NoGroup);
 		}
 	} else if (format == URIMap::instance().urids.atom_eventTransfer) {
 
@@ -103,9 +103,9 @@ LV2PluginUI::touch(void*    controller,
 
 	ControllableRef control = me->_controllables[port_index];
 	if (grabbed) {
-		control->start_touch(control->session().transport_frame());
+		control->start_touch(control->session().transport_sample());
 	} else {
-		control->stop_touch(false, control->session().transport_frame());
+		control->stop_touch(control->session().transport_sample());
 	}
 }
 
@@ -128,7 +128,7 @@ void
 LV2PluginUI::control_changed (uint32_t port_index)
 {
 	/* Must run in GUI thread because we modify _updates with no lock */
-	if (_lv2->get_parameter (port_index) != _values[port_index]) {
+	if (_lv2->get_parameter (port_index) != _values_last_sent_to_ui[port_index]) {
 		/* current plugin parameter does not match last value received
 		   from GUI, so queue an update to push it to the GUI during
 		   our regular timeout.
@@ -140,11 +140,9 @@ LV2PluginUI::control_changed (uint32_t port_index)
 bool
 LV2PluginUI::start_updating(GdkEventAny*)
 {
-	if (!_output_ports.empty()) {
-		_screen_update_connection.disconnect();
-		_screen_update_connection = Timers::super_rapid_connect
-		        (sigc::mem_fun(*this, &LV2PluginUI::output_update));
-	}
+	_screen_update_connection.disconnect();
+	_screen_update_connection = Timers::super_rapid_connect
+		(sigc::mem_fun(*this, &LV2PluginUI::output_update));
 	return false;
 }
 
@@ -152,11 +150,21 @@ bool
 LV2PluginUI::stop_updating(GdkEventAny*)
 {
 	//cout << "stop_updating" << endl;
+	_screen_update_connection.disconnect();
+	return false;
+}
 
-	if (!_output_ports.empty()) {
-		_screen_update_connection.disconnect();
+void
+LV2PluginUI::queue_port_update()
+{
+	const uint32_t num_ports = _lv2->num_ports();
+	for (uint32_t i = 0; i < num_ports; ++i) {
+		bool     ok;
+		uint32_t port = _lv2->nth_parameter(i, ok);
+		if (ok) {
+			_updates.insert (port);
+		}
 	}
-	return false;
 }
 
 void
@@ -191,11 +199,11 @@ LV2PluginUI::output_update()
 		uint32_t index = _output_ports[i];
 		float val = _lv2->get_parameter (index);
 
-		if (val != _values[index]) {
+		if (val != _values_last_sent_to_ui[index]) {
 			/* Send to GUI */
 			suil_instance_port_event ((SuilInstance*)_inst, index, 4, 0, &val);
 			/* Cache current value */
-			_values[index] = val;
+			_values_last_sent_to_ui[index] = val;
 		}
 	}
 
@@ -207,6 +215,7 @@ LV2PluginUI::output_update()
 		float val = _lv2->get_parameter (*i);
 		/* push current value to the GUI */
 		suil_instance_port_event ((SuilInstance*)_inst, (*i), 4, 0, &val);
+		_values_last_sent_to_ui[(*i)] = val;
 	}
 
 	_updates.clear ();
@@ -218,7 +227,7 @@ LV2PluginUI::LV2PluginUI(boost::shared_ptr<PluginInsert> pi,
 	, _pi(pi)
 	, _lv2(lv2p)
 	, _gui_widget(NULL)
-	, _values(NULL)
+	, _values_last_sent_to_ui(NULL)
 	, _external_ui_ptr(NULL)
 	, _inst(NULL)
 {
@@ -226,12 +235,17 @@ LV2PluginUI::LV2PluginUI(boost::shared_ptr<PluginInsert> pi,
 	_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, 4);
-	_ardour_buttons_box.pack_end (reset_button, false, false, 4);
+	if (pi->controls().size() > 0) {
+		_ardour_buttons_box.pack_end (reset_button, false, false, 4);
+	}
 	_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.pack_end (pin_management_button, false, false);
+
+	plugin->PresetLoaded.connect (*this, invalidator (*this), boost::bind (&LV2PluginUI::queue_port_update, this), gui_context ());
 }
 
 void
@@ -372,7 +386,7 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
 		_external_ui_ptr = (struct lv2_external_ui*)GET_WIDGET(_inst);
 	}
 
-	_values = new float[num_ports];
+	_values_last_sent_to_ui = new float[num_ports];
 	_controllables.resize(num_ports);
 
 	for (uint32_t i = 0; i < num_ports; ++i) {
@@ -383,7 +397,7 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
 			   whether it is input or output
 			*/
 
-			_values[port]        = _lv2->get_parameter(port);
+			_values_last_sent_to_ui[port]        = _lv2->get_parameter(port);
 			_controllables[port] = boost::dynamic_pointer_cast<ARDOUR::AutomationControl> (
 				insert->control(Evoral::Parameter(PluginAutomation, 0, port)));
 
@@ -431,7 +445,7 @@ LV2PluginUI::lv2ui_free()
 
 LV2PluginUI::~LV2PluginUI ()
 {
-	delete [] _values;
+	delete [] _values_last_sent_to_ui;
 
 	_message_update_connection.disconnect();
 	_screen_update_connection.disconnect();