mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-04-17 06:46:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pipewire-jack: also ignore ports with other DSP type

Browse source 
The DSP port type needs to be something else than "other" for it
to become visible. This way we can also remove the IS_VISIBLE check
because we never add invisible ports to the object list.
This commit is contained in:
Wim Taymans 2026-04-16 13:47:08 +02:00
parent c3c3cb7ef2
commit 686095ea97
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pipewire-jack/src/pipewire-jack.c
View file

@ -73,7 +73,6 @@ PW_LOG_TOPIC_STATIC(jack_log_topic, "jack");
#define TYPE_ID_IS_EVENT(t) ((t) >= TYPE_ID_MIDI && (t) <= TYPE_ID_UMP) #define TYPE_ID_IS_EVENT(t) ((t) >= TYPE_ID_MIDI && (t) <= TYPE_ID_UMP)
#define TYPE_ID_CAN_OSC(t) ((t) == TYPE_ID_MIDI || (t) == TYPE_ID_OSC) #define TYPE_ID_CAN_OSC(t) ((t) == TYPE_ID_MIDI || (t) == TYPE_ID_OSC)
#define TYPE_ID_IS_HIDDEN(t) ((t) >= TYPE_ID_OTHER)
#define TYPE_ID_IS_COMPATIBLE(a,b)(((a) == (b)) || (TYPE_ID_IS_EVENT(a) && TYPE_ID_IS_EVENT(b))) #define TYPE_ID_IS_COMPATIBLE(a,b)(((a) == (b)) || (TYPE_ID_IS_EVENT(a) && TYPE_ID_IS_EVENT(b)))
#define SELF_CONNECT_ALLOW 0 #define SELF_CONNECT_ALLOW 0
@ -3895,7 +3894,8 @@ static void registry_event_global(void *data, uint32_t id,
if ((str = spa_dict_lookup(props, PW_KEY_FORMAT_DSP)) == NULL) if ((str = spa_dict_lookup(props, PW_KEY_FORMAT_DSP)) == NULL)
goto exit; goto exit;
if ((type_id = string_to_type(str)) == SPA_ID_INVALID) if ((type_id = string_to_type(str)) == SPA_ID_INVALID ||
!type_is_dsp(type_id))
goto exit; goto exit;
if ((str = spa_dict_lookup(props, PW_KEY_NODE_ID)) == NULL) if ((str = spa_dict_lookup(props, PW_KEY_NODE_ID)) == NULL)
@ -5531,7 +5531,8 @@ jack_port_t * jack_port_register (jack_client_t *client,
return NULL; return NULL;
} }
if ((type_id = string_to_type(port_type)) == SPA_ID_INVALID) { if ((type_id = string_to_type(port_type)) == SPA_ID_INVALID ||
!type_is_dsp(type_id)) {
pw_log_warn("unknown port type %s", port_type); pw_log_warn("unknown port type %s", port_type);
return NULL; return NULL;
} }
@ -6935,8 +6936,6 @@ const char ** jack_get_ports (jack_client_t *client,
continue; continue;
pw_log_debug("%p: check port type:%d flags:%08lx name:\"%s\"", c, pw_log_debug("%p: check port type:%d flags:%08lx name:\"%s\"", c,
o->port.type_id, o->port.flags, o->port.name); o->port.type_id, o->port.flags, o->port.name);
if (TYPE_ID_IS_HIDDEN(o->port.type_id))
continue;
if (!SPA_FLAG_IS_SET(o->port.flags, flags)) if (!SPA_FLAG_IS_SET(o->port.flags, flags))
continue; continue;
if (str != NULL && o->port.node != NULL) { if (str != NULL && o->port.node != NULL) {