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

Cleanups

Browse source 
Make separate _register function so that we can first configure the
object before making it publicly visible.
This commit is contained in:
Wim Taymans 2017-09-18 11:54:25 +02:00
parent 67d4dd8656
commit f64c28c091
25 changed files with 131 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/module-jack.c
View file

@ -796,7 +796,6 @@ handle_connect_name_ports(struct client *client)
pw_log_debug("protocol-jack %p: connected ports %p %p", impl, out_port, in_port);
link = pw_link_new(impl->core,
pw_module_get_global(impl->module),
out_port->port,
in_port->port,
NULL,
@ -810,6 +809,7 @@ handle_connect_name_ports(struct client *client)
ld->in_port = in_port;
spa_list_append(&impl->link_list, &ld->link_link);
pw_link_add_listener(link, &ld->link_listener, &link_events, ld);
pw_link_register(link, NULL, pw_module_get_global(impl->module));
pw_link_activate(link);
notify_clients(impl, jack_notify_PortConnectCallback, false, "", src_id, dst_id);
@ -1038,8 +1038,7 @@ static struct client *client_new(struct impl *impl, int fd)
if (properties == NULL)
goto no_props;
client = pw_client_new(impl->core, pw_module_get_global(impl->module),
ucredp, properties, sizeof(struct client));
client = pw_client_new(impl->core, ucredp, properties, sizeof(struct client));
if (client == NULL)
goto no_client;
@ -1058,6 +1057,8 @@ static struct client *client_new(struct impl *impl, int fd)
pw_client_add_listener(client, &this->client_listener, &client_events, this);
pw_client_register(client, NULL, pw_module_get_global(impl->module));
pw_log_debug("module-jack %p: added new client", impl);
return this;
@ -1277,7 +1278,6 @@ make_freewheel_client(struct impl *impl)
}
static bool on_global(void *data, struct pw_global *global)
{
struct impl *impl = data;
struct pw_node *node;
@ -1302,7 +1302,7 @@ static bool on_global(void *data, struct pw_global *global)
if (out_port == NULL || in_port == NULL)
return true;
impl->sink_link = pw_link_new(impl->core, pw_module_get_global(impl->module),
impl->sink_link = pw_link_new(impl->core,
out_port,
in_port,
NULL,
@ -1310,6 +1310,7 @@ static bool on_global(void *data, struct pw_global *global)
NULL,
0);
pw_link_inc_idle(impl->sink_link);
pw_link_register(impl->sink_link, NULL, pw_module_get_global(impl->module));
return false;
}