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

hook: separate spa_callbacks from the hook

Browse source 
Make a spa_callbacks with just the functions and data and use this
in the hook and objects.
This commit is contained in:
Wim Taymans 2019-05-15 12:17:52 +02:00
parent 6ee192dff5
commit 448c1937ad
28 changed files with 97 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/module-client-node/client-node.c
View file

@ -128,7 +128,7 @@ struct node {
struct spa_loop *data_loop;
struct spa_hook_list hooks;
struct spa_hook callbacks;
struct spa_callbacks callbacks;
struct io ios[MAX_IO];
struct pw_resource *resource;
@ -520,7 +520,7 @@ impl_node_set_callbacks(struct spa_node *node,
spa_return_val_if_fail(node != NULL, -EINVAL);
this = SPA_CONTAINER_OF(node, struct node, node);
this->callbacks = SPA_HOOK_INIT(callbacks, data);
this->callbacks = SPA_CALLBACKS_INIT(callbacks, data);
return 0;
}
@ -1529,7 +1529,7 @@ static void node_port_added(void *data, struct pw_port *port)
PW_PORT_MIX_FLAG_MULTI |
PW_PORT_MIX_FLAG_MIX_ONLY);
port->impl = SPA_HOOK_INIT(&port_impl, p);
port->impl = SPA_CALLBACKS_INIT(&port_impl, p);
port->owner_data = impl;
}

4
src/modules/module-client-node/client-stream.c
View file

@ -72,7 +72,7 @@ struct node {
struct spa_param_info params[5];
struct spa_hook_list hooks;
struct spa_hook callbacks;
struct spa_callbacks callbacks;
};
struct impl {
@ -377,7 +377,7 @@ impl_node_set_callbacks(struct spa_node *node,
this = SPA_CONTAINER_OF(node, struct node, node);
this->callbacks = SPA_HOOK_INIT(callbacks, data);
this->callbacks = SPA_CALLBACKS_INIT(callbacks, data);
return 0;
}