mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: find system: port names as well

Browse source 
Make a system:capture_N or system:playback_M name for each port
and use this also in find_node when the node is a default node.
This makes it possible to

jack_connect system:capture_1 system:playback_1

and make it link the default source to defaukt sink.

Fixes #446
This commit is contained in:
Wim Taymans 2021-02-17 11:16:02 +01:00
parent 39cf575210
commit e66cb18659
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -122,6 +122,7 @@ struct object {
char name[REAL_JACK_PORT_NAME_SIZE+1]; char name[REAL_JACK_PORT_NAME_SIZE+1];
char alias1[REAL_JACK_PORT_NAME_SIZE+1]; char alias1[REAL_JACK_PORT_NAME_SIZE+1];
char alias2[REAL_JACK_PORT_NAME_SIZE+1]; char alias2[REAL_JACK_PORT_NAME_SIZE+1];
char system[REAL_JACK_PORT_NAME_SIZE+1];
uint32_t type_id; uint32_t type_id;
uint32_t node_id; uint32_t node_id;
uint32_t port_id; uint32_t port_id;
@ -554,6 +555,11 @@ static struct object *find_port(struct client *c, const char *name)
strcmp(o->port.alias1, name) == 0 || strcmp(o->port.alias1, name) == 0 ||
strcmp(o->port.alias2, name) == 0) strcmp(o->port.alias2, name) == 0)
return o; return o;
if (c->metadata &&
(o->port.node_id == c->metadata->default_audio_source ||
o->port.node_id == c->metadata->default_audio_sink) &&
strcmp(o->port.system, name) == 0)
return o;
} }
return NULL; return NULL;
} }
@ -2213,13 +2219,14 @@ static void registry_event_global(void *data, uint32_t id,
if ((str = spa_dict_lookup(props, PW_KEY_OBJECT_PATH)) != NULL) if ((str = spa_dict_lookup(props, PW_KEY_OBJECT_PATH)) != NULL)
snprintf(o->port.alias1, sizeof(o->port.alias1), "%s", str); snprintf(o->port.alias1, sizeof(o->port.alias1), "%s", str);
else
o->port.alias1[0] = '\0';
if ((str = spa_dict_lookup(props, PW_KEY_PORT_ALIAS)) != NULL) if ((str = spa_dict_lookup(props, PW_KEY_PORT_ALIAS)) != NULL)
snprintf(o->port.alias2, sizeof(o->port.alias2), "%s", str); snprintf(o->port.alias2, sizeof(o->port.alias2), "%s", str);
else
o->port.alias2[0] = '\0'; if ((str = spa_dict_lookup(props, PW_KEY_PORT_ID)) != NULL)
snprintf(o->port.system, sizeof(o->port.system), "system:%s_%d",
flags & JackPortIsInput ? "playback" : "capture",
atoi(str)+1);
o->port.flags = flags; o->port.flags = flags;
o->port.type_id = type_id; o->port.type_id = type_id;