mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: enforce unique port names as well

Browse source
This commit is contained in:
Wim Taymans 2020-07-20 16:27:26 +02:00
parent 8c4b594b50
commit ee2c1f3882
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1972,7 +1972,7 @@ static void registry_event_global(void *data, uint32_t id,
const struct spa_dict *props) const struct spa_dict *props)
{ {
struct client *c = (struct client *) data; struct client *c = (struct client *) data;
struct object *o, *ot; struct object *o, *ot, *op;
const char *str; const char *str;
uint32_t object_type; uint32_t object_type;
size_t size; size_t size;
@ -1994,9 +1994,9 @@ static void registry_event_global(void *data, uint32_t id,
} }
snprintf(o->node.name, sizeof(o->node.name), "%s", str); snprintf(o->node.name, sizeof(o->node.name), "%s", str);
ot = find_node(c, o->node.name); ot = find_node(c, o->node.name);
if (ot != NULL && o->node.client_id != ot->node.client_id) { if (ot != NULL && o->node.client_id != ot->node.client_id)
snprintf(o->node.name, sizeof(o->node.name), "%s-%d", str, id); snprintf(o->node.name, sizeof(o->node.name), "%s-%d", str, id);
}
if ((str = spa_dict_lookup(props, PW_KEY_NODE_NAME)) == NULL) if ((str = spa_dict_lookup(props, PW_KEY_NODE_NAME)) == NULL)
str = o->node.name; str = o->node.name;
snprintf(o->node.key, sizeof(o->node.key), "%s", str); snprintf(o->node.key, sizeof(o->node.key), "%s", str);
@ -2099,6 +2099,10 @@ static void registry_event_global(void *data, uint32_t id,
o->port.playback_latency.min = 1024; o->port.playback_latency.min = 1024;
o->port.playback_latency.max = 1024; o->port.playback_latency.max = 1024;
} }
op = find_port(c, o->port.name);
if (op != NULL && op != o)
snprintf(o->port.name, sizeof(o->port.name), "%.*s-%d",
(int)(sizeof(op->port.name)-11), op->port.name, id);
pw_log_debug(NAME" %p: add port %d %s %d", c, id, o->port.name, type_id); pw_log_debug(NAME" %p: add port %d %s %d", c, id, o->port.name, type_id);
} }