mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pw_registry_proxy -> pw_registry

Browse source
This commit is contained in:
Wim Taymans 2019-12-11 09:44:48 +01:00
parent ecc6b27cd7
commit 49d736bbb7
17 changed files with 140 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pipewire-pulseaudio/src/context.c
View file

@ -721,7 +721,7 @@ static int set_mask(pa_context *c, struct global *g)
if (events) {
pw_log_debug("bind %d", g->id);
g->proxy = pw_registry_proxy_bind(c->registry_proxy, g->id, g->type,
g->proxy = pw_registry_bind(c->registry, g->id, g->type,
client_version, 0);
if (g->proxy == NULL)
return -ENOMEM;
@ -786,9 +786,9 @@ static void registry_event_global_remove(void *object, uint32_t id)
global_free(c, g);
}
static const struct pw_registry_proxy_events registry_events =
static const struct pw_registry_events registry_events =
{
PW_VERSION_REGISTRY_PROXY_EVENTS,
PW_VERSION_REGISTRY_EVENTS,
.global = registry_event_global,
.global_remove = registry_event_global_remove,
};
@ -879,10 +879,10 @@ pa_operation* pa_context_subscribe(pa_context *c, pa_subscription_mask_t m, pa_c
c->subscribe_mask = m;
if (c->registry_proxy == NULL) {
c->registry_proxy = pw_core_get_registry(c->core,
PW_VERSION_REGISTRY_PROXY, 0);
pw_registry_proxy_add_listener(c->registry_proxy,
if (c->registry == NULL) {
c->registry = pw_core_get_registry(c->core,
PW_VERSION_REGISTRY, 0);
pw_registry_add_listener(c->registry,
&c->registry_listener,
&registry_events, c);
}

2
pipewire-pulseaudio/src/internal.h
View file

@ -290,7 +290,7 @@ struct pa_context {
struct spa_hook core_listener;
struct pw_core_info *core_info;
struct pw_registry_proxy *registry_proxy;
struct pw_registry *registry;
struct spa_hook registry_listener;
pa_proplist *proplist;

6
pipewire-pulseaudio/src/introspect.c
View file

@ -1160,7 +1160,7 @@ pa_operation* pa_context_kill_client(pa_context *c, uint32_t idx, pa_context_suc
if (!(g->mask & PA_SUBSCRIPTION_MASK_CLIENT))
return NULL;
pw_registry_proxy_destroy(c->registry_proxy, g->id);
pw_registry_destroy(c->registry, g->id);
o = pa_operation_new(c, NULL, on_success, sizeof(struct success_ack));
d = o->userdata;
@ -1761,7 +1761,7 @@ pa_operation* pa_context_kill_sink_input(pa_context *c, uint32_t idx, pa_context
pw_stream_destroy(s->stream);
}
else if (g) {
pw_registry_proxy_destroy(c->registry_proxy, g->id);
pw_registry_destroy(c->registry, g->id);
}
o = pa_operation_new(c, NULL, on_success, sizeof(struct success_ack));
d = o->userdata;
@ -2054,7 +2054,7 @@ pa_operation* pa_context_kill_source_output(pa_context *c, uint32_t idx, pa_cont
pw_stream_destroy(s->stream);
}
else if (g) {
pw_registry_proxy_destroy(c->registry_proxy, g->id);
pw_registry_destroy(c->registry, g->id);
}
o = pa_operation_new(c, NULL, on_success, sizeof(struct success_ack));
d = o->userdata;