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: use serial for uuid

Browse source 
We must use the serial for generating the uuid.

We use the serial for the port_id and jack_port_uuid_generate() can
be used to turn that into a uuid. So all mappings to and from
uuid need to be with serials.
This commit is contained in:
Wim Taymans 2022-01-26 17:44:49 +01:00
parent 420d65fb38
commit f0cc49766f
2 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pipewire-jack/src/metadata.c
View file

@ -213,7 +213,8 @@ int jack_set_property(jack_client_t*client,
const char* type) const char* type)
{ {
struct client *c = (struct client *) client; struct client *c = (struct client *) client;
uint32_t id; struct object *o;
uint32_t serial;
int res = -1; int res = -1;
spa_return_val_if_fail(c != NULL, -EINVAL); spa_return_val_if_fail(c != NULL, -EINVAL);
@ -227,14 +228,16 @@ int jack_set_property(jack_client_t*client,
if (subject & (1<<30)) if (subject & (1<<30))
goto done; goto done;
id = jack_uuid_to_index(subject); serial = jack_uuid_to_index(subject);
if ((o = find_by_serial(c, serial)) == NULL)
goto done;
if (type == NULL) if (type == NULL)
type = ""; type = "";
pw_log_info("set id:%u (%"PRIu64") '%s' to '%s@%s'", id, subject, key, value, type); pw_log_info("set id:%u (%"PRIu64") '%s' to '%s@%s'", o->id, subject, key, value, type);
if (update_property(c, subject, key, type, value)) if (update_property(c, subject, key, type, value))
pw_metadata_set_property(c->metadata->proxy, id, key, type, value); pw_metadata_set_property(c->metadata->proxy, o->id, key, type, value);
res = 0; res = 0;
done: done:
pw_thread_loop_unlock(c->context.loop); pw_thread_loop_unlock(c->context.loop);

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

@ -313,6 +313,7 @@ struct client {
struct metadata *metadata; struct metadata *metadata;
uint32_t node_id; uint32_t node_id;
uint32_t serial;
struct spa_source *socket_source; struct spa_source *socket_source;
JackThreadCallback thread_callback; JackThreadCallback thread_callback;
@ -402,6 +403,7 @@ struct client {
}; };
static int do_sync(struct client *client); static int do_sync(struct client *client);
static struct object *find_by_serial(struct client *c, uint32_t serial);
#include "metadata.c" #include "metadata.c"
@ -672,15 +674,12 @@ static struct object *find_by_id(struct client *c, uint32_t id)
return NULL; return NULL;
} }
static struct object *find_by_serial(struct client *c, uint32_t serial, uint32_t type) static struct object *find_by_serial(struct client *c, uint32_t serial)
{ {
struct object *o; struct object *o;
spa_list_for_each(o, &c->context.objects, link) { spa_list_for_each(o, &c->context.objects, link) {
if (o->serial == serial) { if (o->serial == serial)
if (o->type == type) return o;
return o;
return NULL;
}
} }
return NULL; return NULL;
} }
@ -2575,10 +2574,10 @@ 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, false); uuid = client_make_uuid(o->serial, false);
break; break;
case INTERFACE_Port: case INTERFACE_Port:
uuid = jack_port_uuid_generate(id); uuid = jack_port_uuid_generate(o->serial);
break; break;
default: default:
return -EINVAL; return -EINVAL;
@ -2685,6 +2684,7 @@ static void registry_event_global(void *data, uint32_t id,
pw_log_debug("%p: add our node %d", c, id); pw_log_debug("%p: add our node %d", c, id);
if (node_name != NULL) if (node_name != NULL)
snprintf(c->name, sizeof(c->name), "%s", node_name); snprintf(c->name, sizeof(c->name), "%s", node_name);
c->serial = serial;
} }
snprintf(o->node.node_name, sizeof(o->node.node_name), snprintf(o->node.node_name, sizeof(o->node.node_name),
"%s", node_name); "%s", node_name);
@ -3456,7 +3456,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, monitor)); uuid = spa_aprintf( "%" PRIu64, client_make_uuid(o->serial, monitor));
break; break;
} }
} }
@ -3487,7 +3487,7 @@ char *jack_get_client_name_by_uuid (jack_client_t *client,
spa_list_for_each(o, &c->context.objects, link) { spa_list_for_each(o, &c->context.objects, link) {
if (o->type != INTERFACE_Node) if (o->type != INTERFACE_Node)
continue; continue;
if (client_make_uuid(o->id, monitor) == uuid) { if (client_make_uuid(o->serial, 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 = spa_aprintf("%s%s", o->node.name, monitor ? MONITOR_EXT : ""); name = spa_aprintf("%s%s", o->node.name, monitor ? MONITOR_EXT : "");
@ -4403,7 +4403,7 @@ jack_uuid_t jack_port_uuid (const jack_port_t *port)
{ {
struct object *o = (struct object *) port; struct object *o = (struct object *) port;
spa_return_val_if_fail(o != NULL, 0); spa_return_val_if_fail(o != NULL, 0);
return jack_port_uuid_generate(o->id); return jack_port_uuid_generate(o->serial);
} }
SPA_EXPORT SPA_EXPORT
@ -5419,7 +5419,9 @@ jack_port_t * jack_port_by_id (jack_client_t *client,
spa_return_val_if_fail(c != NULL, NULL); spa_return_val_if_fail(c != NULL, NULL);
pthread_mutex_lock(&c->context.lock); pthread_mutex_lock(&c->context.lock);
res = find_by_serial(c, port_id, INTERFACE_Port); res = find_by_serial(c, port_id);
if (res && res->type != INTERFACE_Port)
res = NULL;
pw_log_debug("%p: port %d -> %p", c, port_id, res); pw_log_debug("%p: port %d -> %p", c, port_id, res);
pthread_mutex_unlock(&c->context.lock); pthread_mutex_unlock(&c->context.lock);
@ -5849,7 +5851,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, false)); return spa_aprintf("%"PRIu64, client_make_uuid(c->serial, false));
} }
SPA_EXPORT SPA_EXPORT