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

jack: encode monitor uuid with extra bit

Browse source 
So that we can make a difference between monitor and sink uuid.

See #1945
This commit is contained in:
Wim Taymans 2021-12-23 12:25:59 +01:00
parent 08b18b9da4
commit 1f4d3b0a1b
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2471,10 +2471,12 @@ static const char* type_to_string(jack_port_type_id_t type_id)
} }
} }
static jack_uuid_t client_make_uuid(uint32_t id) static jack_uuid_t client_make_uuid(uint32_t id, bool monitor)
{ {
jack_uuid_t uuid = 0x2; /* JackUUIDClient */ jack_uuid_t uuid = 0x2; /* JackUUIDClient */
uuid = (uuid << 32) | (id + 1); uuid = (uuid << 32) | (id + 1);
if (monitor)
uuid |= (1 << 30);
pw_log_debug("uuid %d -> %"PRIu64, id, uuid); pw_log_debug("uuid %d -> %"PRIu64, id, uuid);
return uuid; return uuid;
} }
@ -2538,7 +2540,7 @@ static int metadata_property(void *object, uint32_t id,
switch (o->type) { switch (o->type) {
case INTERFACE_Node: case INTERFACE_Node:
uuid = client_make_uuid(id); uuid = client_make_uuid(id, false);
break; break;
case INTERFACE_Port: case INTERFACE_Port:
uuid = jack_port_uuid_generate(id); uuid = jack_port_uuid_generate(id);
@ -3416,7 +3418,7 @@ char *jack_get_uuid_for_client_name (jack_client_t *client,
if (spa_streq(o->node.name, client_name) || if (spa_streq(o->node.name, client_name) ||
(monitor && spa_strneq(o->node.name, client_name, (monitor && spa_strneq(o->node.name, client_name,
strlen(client_name) - strlen(MONITOR_EXT)))) { strlen(client_name) - strlen(MONITOR_EXT)))) {
uuid = spa_aprintf( "%" PRIu64, client_make_uuid(o->id)); uuid = spa_aprintf( "%" PRIu64, client_make_uuid(o->id, monitor));
break; break;
} }
} }
@ -3433,6 +3435,7 @@ char *jack_get_client_name_by_uuid (jack_client_t *client,
struct object *o; struct object *o;
jack_uuid_t uuid; jack_uuid_t uuid;
char *name = NULL; char *name = NULL;
bool monitor;
spa_return_val_if_fail(c != NULL, NULL); spa_return_val_if_fail(c != NULL, NULL);
spa_return_val_if_fail(client_uuid != NULL, NULL); spa_return_val_if_fail(client_uuid != NULL, NULL);
@ -3440,12 +3443,14 @@ char *jack_get_client_name_by_uuid (jack_client_t *client,
if (jack_uuid_parse(client_uuid, &uuid) < 0) if (jack_uuid_parse(client_uuid, &uuid) < 0)
return NULL; return NULL;
monitor = uuid & (1 << 30);
pthread_mutex_lock(&c->context.lock); pthread_mutex_lock(&c->context.lock);
spa_list_for_each(o, &c->context.nodes, link) { spa_list_for_each(o, &c->context.nodes, link) {
if (client_make_uuid(o->id) == uuid) { if (client_make_uuid(o->id, monitor) == uuid) {
pw_log_debug("%p: uuid %s (%"PRIu64")-> %s", pw_log_debug("%p: uuid %s (%"PRIu64")-> %s",
client, client_uuid, uuid, o->node.name); client, client_uuid, uuid, o->node.name);
name = strdup(o->node.name); name = spa_aprintf("%s%s", o->node.name, monitor ? MONITOR_EXT : "");
break; break;
} }
} }
@ -5787,7 +5792,7 @@ char *jack_client_get_uuid (jack_client_t *client)
spa_return_val_if_fail(c != NULL, NULL); spa_return_val_if_fail(c != NULL, NULL);
return spa_aprintf("%"PRIu64, client_make_uuid(c->node_id)); return spa_aprintf("%"PRIu64, client_make_uuid(c->node_id, false));
} }
SPA_EXPORT SPA_EXPORT

2
pipewire-jack/src/uuid.c
View file

@ -54,7 +54,7 @@ jack_uuid_t jack_port_uuid_generate (uint32_t port_id)
SPA_EXPORT SPA_EXPORT
uint32_t jack_uuid_to_index (jack_uuid_t id) uint32_t jack_uuid_to_index (jack_uuid_t id)
{ {
return (id & 0xffff) - 1; return (id & 0xffffffff) - 1;
} }
SPA_EXPORT SPA_EXPORT