smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 20:56:28 +01:00
Code Issues Projects Releases Wiki Activity

Prefer X11 Plugin UIs

Browse source 
Let LV2 Plugin UI support (via SUIL) prefer and select a X11 UI whenever
multiple UI type options are provided by LV2 plugins (eg. Vee-One's do
present several but their native Qt5UI should never be raised by Ardour,
on any chance:)).

  Signed-off-by: Rui Nuno Capela <rncbc@rncbc.or
This commit is contained in:
Rui Nuno Capela 2019-10-28 16:00:48 +01:00 • committed by Robin Gareus
parent 36ea069722
commit 760a7fda81
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

40
libs/ardour/lv2_plugin.cc
View file

@ -182,6 +182,7 @@ public:
LilvNode* time_Position; LilvNode* time_Position;
LilvNode* time_beatsPerMin; LilvNode* time_beatsPerMin;
LilvNode* ui_GtkUI; LilvNode* ui_GtkUI;
LilvNode* ui_X11UI;
LilvNode* ui_external; LilvNode* ui_external;
LilvNode* ui_externalkx; LilvNode* ui_externalkx;
LilvNode* units_hz; LilvNode* units_hz;
@ -848,19 +849,36 @@ LV2Plugin::init(const void* c_plugin, samplecnt_t rate)
if (lilv_uis_size(uis) > 0) { if (lilv_uis_size(uis) > 0) {
#ifdef HAVE_SUIL #ifdef HAVE_SUIL
// Look for embeddable UI // Look for embeddable UI
LILV_FOREACH(uis, u, uis) { // TODO: Multiple UI support
const LilvUI* this_ui = lilv_uis_get(uis, u); const LilvUI* this_ui = NULL;
const LilvNode* this_ui_type = NULL; const LilvNode* this_ui_type = NULL;
if (lilv_ui_is_supported(this_ui, // Always prefer X11 UIs...
suil_ui_supported, LILV_FOREACH(uis, i, uis) {
_world.ui_GtkUI, const LilvUI* ui = lilv_uis_get(uis, i);
&this_ui_type)) { if (lilv_ui_is_a(ui, _world.ui_X11UI)) {
// TODO: Multiple UI support this_ui = ui;
_impl->ui = this_ui; this_ui_type = _world.ui_X11UI;
_impl->ui_type = this_ui_type;
break; break;
} }
} }
// then anything else...
if (this_ui_type == NULL) {
LILV_FOREACH(uis, i, uis) {
const LilvUI* ui = lilv_uis_get(uis, i);
if (lilv_ui_is_supported(ui,
suil_ui_supported,
_world.ui_GtkUI,
&this_ui_type)) {
this_ui = ui;
break;
}
}
}
// Found one that is supported by SUIL?...
if (this_ui_type != NULL) {
_impl->ui = this_ui;
_impl->ui_type = this_ui_type;
}
#else #else
// Look for Gtk native UI // Look for Gtk native UI
LILV_FOREACH(uis, i, uis) { LILV_FOREACH(uis, i, uis) {
@ -3266,6 +3284,7 @@ LV2World::LV2World()
time_Position = lilv_new_uri(world, LV2_TIME__Position); time_Position = lilv_new_uri(world, LV2_TIME__Position);
time_beatsPerMin = lilv_new_uri(world, LV2_TIME__beatsPerMinute); time_beatsPerMin = lilv_new_uri(world, LV2_TIME__beatsPerMinute);
ui_GtkUI = lilv_new_uri(world, LV2_UI__GtkUI); ui_GtkUI = lilv_new_uri(world, LV2_UI__GtkUI);
ui_X11UI = lilv_new_uri(world, LV2_UI__X11UI);
ui_external = lilv_new_uri(world, "http://lv2plug.in/ns/extensions/ui#external"); 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"); ui_externalkx = lilv_new_uri(world, "http://kxstudio.sf.net/ns/lv2ext/external-ui#Widget");
units_unit = lilv_new_uri(world, LV2_UNITS__unit); units_unit = lilv_new_uri(world, LV2_UNITS__unit);
@ -3318,6 +3337,7 @@ LV2World::~LV2World()
lilv_node_free(units_render); lilv_node_free(units_render);
lilv_node_free(ui_externalkx); lilv_node_free(ui_externalkx);
lilv_node_free(ui_external); lilv_node_free(ui_external);
lilv_node_free(ui_X11UI);
lilv_node_free(ui_GtkUI); lilv_node_free(ui_GtkUI);
lilv_node_free(time_beatsPerMin); lilv_node_free(time_beatsPerMin);
lilv_node_free(time_Position); lilv_node_free(time_Position);