mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-22 08:56:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for api change

Browse source
This commit is contained in:
Wim Taymans 2019-05-29 10:38:49 +02:00
parent af61dcebbf
commit 531185845a
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/context.c
View file

@ -46,7 +46,7 @@ static void global_free(pa_context *c, struct global *g)
if (g->destroy) if (g->destroy)
g->destroy(g); g->destroy(g);
if (g->proxy) { if (g->proxy) {
spa_hook_remove(&g->proxy_proxy_listener); spa_hook_remove(&g->object_listener);
spa_hook_remove(&g->proxy_listener); spa_hook_remove(&g->proxy_listener);
pw_proxy_destroy(g->proxy); pw_proxy_destroy(g->proxy);
} }
@ -621,7 +621,7 @@ static int set_mask(pa_context *c, struct global *g)
if (g->proxy == NULL) if (g->proxy == NULL)
return -ENOMEM; return -ENOMEM;
pw_proxy_add_proxy_listener(g->proxy, &g->proxy_proxy_listener, events, g); pw_proxy_add_object_listener(g->proxy, &g->object_listener, events, g);
pw_proxy_add_listener(g->proxy, &g->proxy_listener, &proxy_events, g); pw_proxy_add_listener(g->proxy, &g->proxy_listener, &proxy_events, g);
g->destroy = destroy; g->destroy = destroy;
} else { } else {
@ -639,7 +639,7 @@ static void registry_event_global(void *data, uint32_t id, uint32_t parent_id,
struct global *g; struct global *g;
g = calloc(1, sizeof(struct global)); g = calloc(1, sizeof(struct global));
pw_log_debug("context %p: global %d %p", c, id, g); pw_log_debug("context %p: global %d %u %p", c, id, type, g);
g->context = c; g->context = c;
g->id = id; g->id = id;
g->parent_id = parent_id; g->parent_id = parent_id;

2
src/internal.h
View file

@ -234,7 +234,7 @@ struct global {
struct pw_proxy *proxy; struct pw_proxy *proxy;
struct spa_hook proxy_listener; struct spa_hook proxy_listener;
struct spa_hook proxy_proxy_listener; struct spa_hook object_listener;
union { union {
/* for links */ /* for links */