destroy proxies when global is removed

When a global is removed, also remove the proxies. We can have multiple
proxies to a global otherwise when a client has a sequence of events
queued from the server like this:

Global 1 added
Global 1 removed
Global 1 added

The proxy we added in the firt event would not be destroyed because the
server did not know about it when global 1 was removed and then a
second one would be made.
This commit is contained in:
Wim Taymans 2021-11-08 12:52:22 +01:00
parent 2329a4d323
commit 5ed4977b38
3 changed files with 31 additions and 8 deletions

View file

@ -633,8 +633,25 @@ static void registry_event_global(void *data, uint32_t id,
}
}
static void registry_event_global_remove(void *object, uint32_t id)
static struct global *find_global(struct file *file, uint32_t id)
{
struct global *g;
spa_list_for_each(g, &file->globals, link) {
if (g->id == id)
return g;
}
return NULL;
}
static void registry_event_global_remove(void *data, uint32_t id)
{
struct file *file = data;
struct global *g;
if ((g = find_global(file, id)) == NULL)
return;
pw_proxy_destroy(g->proxy);
}
static const struct pw_registry_events registry_events = {