From 531185845afd0844ee1e513e9c941e4f1501ef2d Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 29 May 2019 10:38:49 +0200 Subject: [PATCH] fix for api change --- src/context.c | 6 +++--- src/internal.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/context.c b/src/context.c index 9910cc83c..123459a26 100644 --- a/src/context.c +++ b/src/context.c @@ -46,7 +46,7 @@ static void global_free(pa_context *c, struct global *g) if (g->destroy) g->destroy(g); if (g->proxy) { - spa_hook_remove(&g->proxy_proxy_listener); + spa_hook_remove(&g->object_listener); spa_hook_remove(&g->proxy_listener); pw_proxy_destroy(g->proxy); } @@ -621,7 +621,7 @@ static int set_mask(pa_context *c, struct global *g) if (g->proxy == NULL) 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); g->destroy = destroy; } else { @@ -639,7 +639,7 @@ static void registry_event_global(void *data, uint32_t id, uint32_t parent_id, struct global *g; 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->id = id; g->parent_id = parent_id; diff --git a/src/internal.h b/src/internal.h index 2b57638ef..12d458673 100644 --- a/src/internal.h +++ b/src/internal.h @@ -234,7 +234,7 @@ struct global { struct pw_proxy *proxy; struct spa_hook proxy_listener; - struct spa_hook proxy_proxy_listener; + struct spa_hook object_listener; union { /* for links */