X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Flv2_plugin.cc;h=f5dcc264101b33e456a093ca1e670a4162b2ebc6;hb=ed42f3359b603dd07835bbdb2c215d83b2e97a16;hp=2d9d2c6dd1022cbc8d485f3d7bffeedf34c90891;hpb=116694a2cb993c03233eea4c33d605d45b3cb891;p=ardour.git

diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index 2d9d2c6dd1..f5dcc26410 100644
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -142,6 +142,9 @@ public:
 	LilvNode* time_Position;
 	LilvNode* ui_GtkUI;
 	LilvNode* ui_external;
+	LilvNode* ui_externalkx;
+	LilvNode* units_unit;
+	LilvNode* units_midiNote;
 
 private:
 	bool _bundle_checked;
@@ -289,7 +292,7 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
 	_latency_control_port   = 0;
 	_next_cycle_start       = std::numeric_limits<framepos_t>::max();
 	_next_cycle_speed       = 1.0;
-	_block_length           = _engine.frames_per_cycle();
+	_block_length           = _engine.samples_per_cycle();
 	_seq_size               = _engine.raw_buffer_size(DataType::MIDI);
 	_state_version          = 0;
 	_was_activated          = false;
@@ -561,11 +564,15 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
 		if (!_impl->ui) {
 			LILV_FOREACH(uis, i, uis) {
 				const LilvUI* ui = lilv_uis_get(uis, i);
-				if (lilv_ui_is_a(ui, _world.ui_external)) {
+				if (lilv_ui_is_a(ui, _world.ui_externalkx)) {
 					_impl->ui      = ui;
 					_impl->ui_type = _world.ui_external;
 					break;
 				}
+				if (lilv_ui_is_a(ui, _world.ui_external)) {
+					_impl->ui      = ui;
+					_impl->ui_type = _world.ui_external;
+				}
 			}
 		}
 	}
@@ -613,7 +620,16 @@ LV2Plugin::is_external_ui() const
 	if (!_impl->ui) {
 		return false;
 	}
-	return lilv_ui_is_a(_impl->ui, _world.ui_external);
+	return lilv_ui_is_a(_impl->ui, _world.ui_external) || lilv_ui_is_a(_impl->ui, _world.ui_externalkx);
+}
+
+bool
+LV2Plugin::is_external_kx() const
+{
+	if (!_impl->ui) {
+		return false;
+	}
+	return lilv_ui_is_a(_impl->ui, _world.ui_externalkx);
 }
 
 bool
@@ -1149,7 +1165,7 @@ LV2Plugin::write_from_ui(uint32_t       index,
 		 *  -> 15 * 32K
 		 * it is safe to overflow (but the plugin state may be inconsistent).
 		 */
-		rbs = min((size_t) 32768 * 6, rbs);
+		rbs = max((size_t) 32768 * 6, rbs);
 		_from_ui = new RingBuffer<uint8_t>(rbs);
 	}
 
@@ -1179,7 +1195,7 @@ LV2Plugin::enable_ui_emmission()
 	if (!_to_ui) {
 		/* see note in LV2Plugin::write_from_ui() */
 		size_t rbs = _session.engine().raw_buffer_size(DataType::MIDI) * NBUFS;
-		rbs = min((size_t) 32768 * 8, rbs);
+		rbs = max((size_t) 32768 * 8, rbs);
 		_to_ui = new RingBuffer<uint8_t>(rbs);
 	}
 }
@@ -1314,8 +1330,10 @@ LV2Plugin::get_parameter_descriptor(uint32_t which, ParameterDescriptor& desc) c
 {
 	const LilvPort* port = lilv_plugin_get_port_by_index(_impl->plugin, which);
 
+	LilvNodes* portunits;
 	LilvNode *def, *min, *max;
 	lilv_port_get_range(_impl->plugin, port, &def, &min, &max);
+	portunits = lilv_port_get_value(_impl->plugin, port, _world.units_unit);
 
 	desc.integer_step = lilv_port_has_property(_impl->plugin, port, _world.lv2_integer);
 	desc.toggled      = lilv_port_has_property(_impl->plugin, port, _world.lv2_toggled);
@@ -1324,6 +1342,8 @@ LV2Plugin::get_parameter_descriptor(uint32_t which, ParameterDescriptor& desc) c
 	desc.label        = lilv_node_as_string(lilv_port_get_name(_impl->plugin, port));
 	desc.lower        = min ? lilv_node_as_float(min) : 0.0f;
 	desc.upper        = max ? lilv_node_as_float(max) : 1.0f;
+	desc.midinote     = lilv_nodes_contains(portunits, _world.units_midiNote);
+
 	if (desc.sr_dependent) {
 		desc.lower *= _session.frame_rate ();
 		desc.upper *= _session.frame_rate ();
@@ -1348,6 +1368,7 @@ LV2Plugin::get_parameter_descriptor(uint32_t which, ParameterDescriptor& desc) c
 	lilv_node_free(def);
 	lilv_node_free(min);
 	lilv_node_free(max);
+	lilv_nodes_free(portunits);
 
 	return 0;
 }
@@ -1367,11 +1388,6 @@ LV2Plugin::describe_parameter(Evoral::Parameter which)
 			return X_("hidden");
 		}
 
-		if (lilv_port_has_property(_impl->plugin,
-					lilv_plugin_get_port_by_index(_impl->plugin, which.id()), _world.lv2_sampleRate)) {
-			return X_("hidden");
-		}
-
 		if (lilv_port_has_property(_impl->plugin,
 					lilv_plugin_get_port_by_index(_impl->plugin, which.id()), _world.lv2_reportsLatency)) {
 			return X_("latency");
@@ -1915,7 +1931,7 @@ LV2Plugin::Impl::designated_input (const char* uri, void** bufptrs[], void** buf
 	return port;
 }
 
-static bool lv2_filter (const string& str, void * /* arg*/)
+static bool lv2_filter (const string& str, void* /*arg*/)
 {
 	/* Not a dotfile, has a prefix before a period, suffix is "lv2" */
 	
@@ -1955,10 +1971,16 @@ LV2World::LV2World()
 	time_Position      = lilv_new_uri(world, LV2_TIME__Position);
 	ui_GtkUI           = lilv_new_uri(world, LV2_UI__GtkUI);
 	ui_external        = lilv_new_uri(world, "http://lv2plug.in/ns/extensions/ui#external");
+	ui_externalkx      = lilv_new_uri(world, "http://kxstudio.sf.net/ns/lv2ext/external-ui#Widget");
+	units_unit         = lilv_new_uri(world, "http://lv2plug.in/ns/extensions/units#unit");
+	units_midiNote     = lilv_new_uri(world, "http://lv2plug.in/ns/extensions/units#midiNote");
 }
 
 LV2World::~LV2World()
 {
+	lilv_node_free(units_midiNote);
+	lilv_node_free(units_unit);
+	lilv_node_free(ui_externalkx);
 	lilv_node_free(ui_external);
 	lilv_node_free(ui_GtkUI);
 	lilv_node_free(time_Position);