mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse: always load the registry

Browse source 
Always get the registry, even if we're not using the introspect API
we still need it to keep track of the linked devices.
This commit is contained in:
Wim Taymans 2020-08-04 18:16:02 +02:00
parent 653465a1b1
commit 377b3f9d42
3 changed files with 7 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1353,18 +1353,6 @@ static void on_success(pa_operation *o, void *userdata)
pa_operation_done(o);
}
void pa_context_ensure_registry(pa_context *c)
{
if (c->registry != NULL)
return;
c->registry = pw_core_get_registry(c->core,
PW_VERSION_REGISTRY, 0);
pw_registry_add_listener(c->registry,
&c->registry_listener,
&registry_events, c);
}
SPA_EXPORT
pa_operation* pa_context_subscribe(pa_context *c, pa_subscription_mask_t m, pa_context_success_cb_t cb, void *userdata)
{
@ -1378,8 +1366,6 @@ pa_operation* pa_context_subscribe(pa_context *c, pa_subscription_mask_t m, pa_c
c->subscribe_mask = m;
pa_context_ensure_registry(c);
o = pa_operation_new(c, NULL, on_success, sizeof(struct success_data));
d = o->userdata;
d->cb = cb;
@ -1561,6 +1547,12 @@ int pa_context_connect(pa_context *c, const char *server, pa_context_flags_t fla
}
pw_core_add_listener(c->core, &c->core_listener, &core_events, c);
c->registry = pw_core_get_registry(c->core,
PW_VERSION_REGISTRY, 0);
pw_registry_add_listener(c->registry,
&c->registry_listener,
&registry_events, c);
exit:
pa_context_unref(c);
@ -1677,8 +1669,6 @@ pa_operation* pa_context_set_default_sink(pa_context *c, const char *name, pa_co
pa_operation *o;
struct default_node *d;
pa_context_ensure_registry(c);
o = pa_operation_new(c, NULL, do_default_node, sizeof(*d));
d = o->userdata;
d->mask = PA_SUBSCRIPTION_MASK_SINK;
@ -1697,8 +1687,6 @@ pa_operation* pa_context_set_default_source(pa_context *c, const char *name, pa_
pa_operation *o;
struct default_node *d;
pa_context_ensure_registry(c);
o = pa_operation_new(c, NULL, do_default_node, sizeof(*d));
d = o->userdata;
d->mask = PA_SUBSCRIPTION_MASK_SOURCE;