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

adapter: make the factory work without a resource

Browse source 
Free the slave when the adapter is destroyed.
This commit is contained in:
Wim Taymans 2019-07-12 09:57:31 +02:00
parent 356f1242be
commit 5385bb5674
3 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/module-adapter/adapter.c
View file

@ -79,6 +79,8 @@ struct node {
struct pw_node *node;
struct spa_hook node_listener;
struct pw_node *slave;
void *user_data;
enum pw_direction direction;
struct pw_properties *props;
@ -160,13 +162,14 @@ static void node_destroy(void *data)
struct node *n = data;
struct port *p, *tmp;
pw_properties_free(n->props);
spa_list_for_each_safe(p, tmp, &n->ports, link) {
pw_port_set_mix(p->port, NULL, 0);
spa_list_remove(&p->link);
spa_handle_clear(p->spa_handle);
free(p);
}
pw_node_destroy(n->slave);
pw_properties_free(n->props);
}
static void node_port_init(void *data, struct pw_port *port)
@ -318,6 +321,7 @@ struct pw_node *pw_adapter_new(struct pw_core *core,
n = pw_spa_node_get_user_data(node);
n->core = core;
n->node = node;
n->slave = slave;
n->direction = direction;
n->props = props;
spa_list_init(&n->ports);

3
src/modules/module-adapter/floatmix.c
View file

@ -619,6 +619,9 @@ impl_node_port_set_io(void *object,
port = GET_PORT(this, direction, port_id);
spa_log_debug(this->log, NAME " %p: port %d:%d io %d %p/%zd", this,
direction, port_id, id, data, size);
switch (id) {
case SPA_IO_Buffers:
port->io = data;