From e75fc459b3bf87bf0a1b07414cf12e73d85e4230 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 21 Apr 2023 15:04:45 +0200 Subject: [PATCH] jack: add jack.show-midi option Add an option to show of hide MIDI ports, true by default. Add jack.show-midi to config --- pipewire-jack/src/pipewire-jack.c | 6 +++++- src/daemon/jack.conf.in | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c index 20faf94e4..5c38e7d93 100644 --- a/pipewire-jack/src/pipewire-jack.c +++ b/pipewire-jack/src/pipewire-jack.c @@ -374,6 +374,7 @@ struct client { unsigned int warn_mlock:1; unsigned int timeowner_conditional:1; unsigned int show_monitor:1; + unsigned int show_midi:1; unsigned int merge_monitor:1; unsigned int short_name:1; unsigned int filter_name:1; @@ -2956,6 +2957,8 @@ static void registry_event_global(void *data, uint32_t id, } if (is_monitor && !c->show_monitor) goto exit; + if (type_id == TYPE_ID_MIDI && !c->show_midi) + goto exit; o = NULL; if (node_id == c->node_id) { @@ -3466,6 +3469,7 @@ jack_client_t * jack_client_open (const char *client_name, client->info.change_mask = 0; client->show_monitor = pw_properties_get_bool(client->props, "jack.show-monitor", true); + client->show_midi = pw_properties_get_bool(client->props, "jack.show-midi", true); client->merge_monitor = pw_properties_get_bool(client->props, "jack.merge-monitor", true); client->short_name = pw_properties_get_bool(client->props, "jack.short-name", false); client->filter_name = pw_properties_get_bool(client->props, "jack.filter-name", false); @@ -5223,7 +5227,7 @@ int jack_connect (jack_client_t *client, pw_proxy_destroy(proxy); - exit: +exit: pw_thread_loop_unlock(c->context.loop); return -res; diff --git a/src/daemon/jack.conf.in b/src/daemon/jack.conf.in index 281cab605..af86ca094 100644 --- a/src/daemon/jack.conf.in +++ b/src/daemon/jack.conf.in @@ -72,6 +72,7 @@ jack.properties = { #node.force-quantum = 0 #jack.show-monitor = true #jack.merge-monitor = true + #jack.show-midi = true #jack.short-name = false #jack.filter-name = false #jack.filter-char = " "