mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: use the manager sync method for async replies

Browse source 
Use the manager sync method to wait until all pending queries are
finished. It is the manager that will query the new parameters so
we need to wait until that completes.

See #868
This commit is contained in:
Wim Taymans 2021-03-09 12:09:05 +01:00
parent 82c452a93d
commit c237ccfbda
1 changed files with 5 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -120,7 +120,6 @@ struct client;
struct operation {
struct spa_list link;
struct client *client;
int seq;
uint32_t tag;
};
@ -140,7 +139,6 @@ struct client {
struct pw_properties *props;
struct pw_core *core;
struct spa_hook core_listener;
struct pw_manager *manager;
struct spa_hook manager_listener;
@ -498,8 +496,9 @@ static int operation_new(struct client *client, uint32_t tag)
o->client = client;
o->tag = tag;
o->seq = pw_core_sync(client->core, PW_ID_CORE, 0);
spa_list_append(&client->operations, &o->link);
pw_manager_sync(client->manager);
pw_log_debug(NAME" %p: operation tag:%u", client, tag);
return 0;
}
@ -725,6 +724,7 @@ static int reply_set_client_name(struct client *client, uint32_t tag)
static void manager_sync(void *data)
{
struct client *client = data;
struct operation *o;
pw_log_debug(NAME" %p: manager sync", client);
@ -732,6 +732,8 @@ static void manager_sync(void *data)
reply_set_client_name(client, client->connect_tag);
client->connect_tag = SPA_ID_INVALID;
}
spa_list_consume(o, &client->operations, link)
operation_complete(o);
}
static struct stream *find_stream(struct client *client, uint32_t id)
@ -1018,22 +1020,6 @@ static void manager_metadata(void *data, struct pw_manager_object *o,
}
}
static void client_core_done(void *data, uint32_t id, int seq)
{
struct client *client = data;
struct operation *o, *t;
spa_list_for_each_safe(o, t, &client->operations, link) {
if (o->seq == seq)
operation_complete(o);
}
}
static const struct pw_core_events client_core_events = {
PW_VERSION_CORE_EVENTS,
.done = client_core_done,
};
static const struct pw_manager_events manager_events = {
PW_VERSION_MANAGER_EVENTS,
.sync = manager_sync,
@ -1082,8 +1068,6 @@ static int do_set_client_name(struct client *client, uint32_t command, uint32_t
goto error;
}
client->connect_tag = tag;
pw_core_add_listener(client->core, &client->core_listener,
&client_core_events, client);
pw_manager_add_listener(client->manager, &client->manager_listener,
&manager_events, client);
} else {