fdo-mirrors/wireplumber
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/wireplumber.git synced 2026-05-01 01:07:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

registry: change _prepare_new_global() to return the global in a less awkward way

Browse source 
the global is stored internally and the returned ref is only useful
in the WpProxy code, not in the registry_global() event
This commit is contained in:
George Kiagiadakis 2020-02-17 18:41:36 +02:00
parent c46a48d13f
commit 77bb816b52
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/wp/object-manager.c
View file

@ -529,8 +529,8 @@ registry_global (void *data, uint32_t id, uint32_t permissions,
g_debug ("registry global:%u perm:0x%x type:%s/%u -> %s",
id, permissions, type, version, g_type_name (gtype));
g_autoptr (WpGlobal) global = wp_registry_prepare_new_global (self, id,
permissions, WP_GLOBAL_FLAG_APPEARS_ON_REGISTRY, gtype, NULL, props);
wp_registry_prepare_new_global (self, id, permissions,
WP_GLOBAL_FLAG_APPEARS_ON_REGISTRY, gtype, NULL, props, NULL);
}
/* called by the registry when a global is removed */
@ -708,26 +708,26 @@ expose_tmp_globals (WpCore *core, GAsyncResult *res, WpRegistry *self)
/*
* wp_registry_prepare_new_global:
* @new_global: (out) (transfer full) (optional): the new global
*
* This is normally called up to 2 times in the same sync cycle:
* one from registry_global(), another from the proxy bound event
* Unfortunately the order in which those 2 events happen is specific
* to the implementation of the object, which is why this is implemented
* with a temporary globals list that get exposed later to the object managers
*
* Returns: (transfer full): the new global
*/
WpGlobal *
void
wp_registry_prepare_new_global (WpRegistry * self, guint32 id,
guint32 permissions, guint32 flag, GType type,
WpProxy *proxy, const struct spa_dict *props)
WpProxy *proxy, const struct spa_dict *props,
WpGlobal ** new_global)
{
g_autoptr (WpGlobal) global = NULL;
WpCore *core = wp_registry_get_core (self);
g_return_val_if_fail (flag != 0, NULL);
g_return_val_if_fail (self->globals->len <= id ||
g_ptr_array_index (self->globals, id) == NULL, NULL);
g_return_if_fail (flag != 0);
g_return_if_fail (self->globals->len <= id ||
g_ptr_array_index (self->globals, id) == NULL);
for (guint i = 0; i < self->tmp_globals->len; i++) {
WpGlobal *g = g_ptr_array_index (self->tmp_globals, i);
@ -770,7 +770,7 @@ wp_registry_prepare_new_global (WpRegistry * self, guint32 id,
global->type = type;
if (proxy) {
g_return_val_if_fail (global->proxy == NULL, NULL);
g_return_if_fail (global->proxy == NULL);
global->proxy = proxy;
}
@ -778,7 +778,8 @@ wp_registry_prepare_new_global (WpRegistry * self, guint32 id,
wp_properties_update_from_dict (global->properties, props);
}
return g_steal_pointer (&global);
if (new_global)
*new_global = g_steal_pointer (&global);
}
/*

5
lib/wp/private.h
View file

@ -43,9 +43,10 @@ void wp_registry_clear (WpRegistry *self);
void wp_registry_attach (WpRegistry *self, struct pw_core *pw_core);
void wp_registry_detach (WpRegistry *self);
WpGlobal * wp_registry_prepare_new_global (WpRegistry * self, guint32 id,
void wp_registry_prepare_new_global (WpRegistry * self, guint32 id,
guint32 permissions, guint32 flag, GType type,
WpProxy *proxy, const struct spa_dict *props);
WpProxy *proxy, const struct spa_dict *props,
WpGlobal ** new_global);
gpointer wp_registry_find_object (WpRegistry *reg, GEqualFunc func,
gconstpointer data);

4
lib/wp/proxy.c
View file

@ -120,9 +120,9 @@ proxy_event_bound (void *data, uint32_t global_id)
if (!priv->global) {
g_autoptr (WpCore) core = g_weak_ref_get (&priv->core);
priv->global = wp_registry_prepare_new_global (wp_core_get_registry (core),
wp_registry_prepare_new_global (wp_core_get_registry (core),
global_id, PW_PERM_RWX, WP_GLOBAL_FLAG_OWNED_BY_PROXY,
G_TYPE_FROM_INSTANCE (self), self, NULL);
G_TYPE_FROM_INSTANCE (self), self, NULL, &priv->global);
}
}