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

lib: core: merge wp_core_connect implementations

Browse source
This commit is contained in:
tytan652 2024-07-08 15:31:48 +02:00 • committed by George Kiagiadakis
parent 41523b68ba
commit 895c1c7286
1 changed files with 33 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
lib/wp/core.c
View file

@ -851,6 +851,37 @@ wp_core_get_vm_type (WpCore *self)
return res;
}
static gboolean
wp_core_connect_internal (WpCore *self, int fd)
{
struct pw_properties *p = NULL;
/* Don't do anything if core is already connected */
if (self->pw_core)
return TRUE;
/* Connect */
p = self->properties ? wp_properties_to_pw_properties (self->properties) : NULL;
if (fd == -1)
self->pw_core = pw_context_connect (self->pw_context, p, 0);
else
self->pw_core = pw_context_connect_fd (self->pw_context, fd, p, 0);
if (!self->pw_core)
return FALSE;
/* Add the core listeners */
pw_core_add_listener (self->pw_core, &self->core_listener, &core_events, self);
pw_proxy_add_listener((struct pw_proxy*)self->pw_core,
&self->proxy_core_listener, &proxy_core_events, self);
/* Add the registry listener */
wp_registry_attach (&self->registry, self->pw_core);
return TRUE;
}
/*!
* \brief Connects this core to the PipeWire server.
*
@ -864,29 +895,9 @@ wp_core_get_vm_type (WpCore *self)
gboolean
wp_core_connect (WpCore *self)
{
struct pw_properties *p = NULL;
g_return_val_if_fail (WP_IS_CORE (self), FALSE);
/* Don't do anything if core is already connected */
if (self->pw_core)
return TRUE;
/* Connect */
p = self->properties ? wp_properties_to_pw_properties (self->properties) : NULL;
self->pw_core = pw_context_connect (self->pw_context, p, 0);
if (!self->pw_core)
return FALSE;
/* Add the core listeners */
pw_core_add_listener (self->pw_core, &self->core_listener, &core_events, self);
pw_proxy_add_listener((struct pw_proxy*)self->pw_core,
&self->proxy_core_listener, &proxy_core_events, self);
/* Add the registry listener */
wp_registry_attach (&self->registry, self->pw_core);
return TRUE;
return wp_core_connect_internal (self, -1);
}
/*!
@ -904,30 +915,10 @@ wp_core_connect (WpCore *self)
gboolean
wp_core_connect_fd (WpCore *self, int fd)
{
struct pw_properties *p = NULL;
g_return_val_if_fail (WP_IS_CORE (self), FALSE);
g_return_val_if_fail (fd > -1, FALSE);
/* Don't do anything if core is already connected */
if (self->pw_core)
return TRUE;
/* Connect */
p = self->properties ? wp_properties_to_pw_properties (self->properties) : NULL;
self->pw_core = pw_context_connect_fd (self->pw_context, fd, p, 0);
if (!self->pw_core)
return FALSE;
/* Add the core listeners */
pw_core_add_listener (self->pw_core, &self->core_listener, &core_events, self);
pw_proxy_add_listener((struct pw_proxy*)self->pw_core,
&self->proxy_core_listener, &proxy_core_events, self);
/* Add the registry listener */
wp_registry_attach (&self->registry, self->pw_core);
return TRUE;
return wp_core_connect_internal (self, fd);
}
/*!