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

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

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

@ -53,6 +53,7 @@ struct factory_data {
struct spa_list node_list; struct spa_list node_list;
struct pw_core *core;
struct pw_module *module; struct pw_module *module;
struct spa_hook module_listener; struct spa_hook module_listener;
}; };
@ -98,15 +99,11 @@ static void *create_object(void *_data,
uint32_t new_id) uint32_t new_id)
{ {
struct factory_data *d = _data; struct factory_data *d = _data;
struct pw_client *client = pw_resource_get_client(resource); struct pw_client *client;
struct pw_node *adapter, *slave; struct pw_node *adapter, *slave;
const char *factory_name; const char *factory_name;
int res; int res;
struct node_data *nd; struct node_data *nd;
struct pw_resource *bound_resource;
if (resource == NULL)
goto error_resource;
if (properties == NULL) if (properties == NULL)
goto error_properties; goto error_properties;
@ -115,7 +112,7 @@ static void *create_object(void *_data,
if (factory_name == NULL) if (factory_name == NULL)
goto error_properties; goto error_properties;
slave = pw_spa_node_load(client->core, slave = pw_spa_node_load(d->core,
NULL, NULL,
pw_factory_get_global(d->this), pw_factory_get_global(d->this),
factory_name, factory_name,
@ -144,10 +141,14 @@ static void *create_object(void *_data,
nd->adapter = adapter; nd->adapter = adapter;
spa_list_append(&d->node_list, &nd->link); spa_list_append(&d->node_list, &nd->link);
client = pw_resource_get_client(resource); pw_node_add_listener(adapter, &nd->adapter_listener, &node_events, nd);
client = resource ? pw_resource_get_client(resource): NULL;
pw_node_register(adapter, client, pw_module_get_global(d->module), NULL); pw_node_register(adapter, client, pw_module_get_global(d->module), NULL);
pw_node_add_listener(adapter, &nd->adapter_listener, &node_events, nd);
if (client) {
struct pw_resource *bound_resource;
res = pw_global_bind(pw_node_get_global(adapter), client, res = pw_global_bind(pw_node_get_global(adapter), client,
PW_PERM_RWX, PW_VERSION_NODE_PROXY, new_id); PW_PERM_RWX, PW_VERSION_NODE_PROXY, new_id);
@ -158,15 +159,12 @@ static void *create_object(void *_data,
goto error_bind; goto error_bind;
pw_resource_add_listener(bound_resource, &nd->resource_listener, &resource_events, nd); pw_resource_add_listener(bound_resource, &nd->resource_listener, &resource_events, nd);
}
pw_node_set_active(adapter, true); pw_node_set_active(adapter, true);
return adapter; return adapter;
error_resource:
res = -EINVAL;
pw_log_error("adapter needs a resource");
goto error_cleanup;
error_properties: error_properties:
res = -EINVAL; res = -EINVAL;
pw_log_error("factory %p: usage: " FACTORY_USAGE, d->this); pw_log_error("factory %p: usage: " FACTORY_USAGE, d->this);
@ -234,6 +232,7 @@ static int module_init(struct pw_module *module, struct pw_properties *propertie
data = pw_factory_get_user_data(factory); data = pw_factory_get_user_data(factory);
data->this = factory; data->this = factory;
data->core = core;
data->module = module; data->module = module;
spa_list_init(&data->node_list); spa_list_init(&data->node_list);

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

@ -79,6 +79,8 @@ struct node {
struct pw_node *node; struct pw_node *node;
struct spa_hook node_listener; struct spa_hook node_listener;
struct pw_node *slave;
void *user_data; void *user_data;
enum pw_direction direction; enum pw_direction direction;
struct pw_properties *props; struct pw_properties *props;
@ -160,13 +162,14 @@ static void node_destroy(void *data)
struct node *n = data; struct node *n = data;
struct port *p, *tmp; struct port *p, *tmp;
pw_properties_free(n->props);
spa_list_for_each_safe(p, tmp, &n->ports, link) { spa_list_for_each_safe(p, tmp, &n->ports, link) {
pw_port_set_mix(p->port, NULL, 0); pw_port_set_mix(p->port, NULL, 0);
spa_list_remove(&p->link); spa_list_remove(&p->link);
spa_handle_clear(p->spa_handle); spa_handle_clear(p->spa_handle);
free(p); free(p);
} }
pw_node_destroy(n->slave);
pw_properties_free(n->props);
} }
static void node_port_init(void *data, struct pw_port *port) 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 = pw_spa_node_get_user_data(node);
n->core = core; n->core = core;
n->node = node; n->node = node;
n->slave = slave;
n->direction = direction; n->direction = direction;
n->props = props; n->props = props;
spa_list_init(&n->ports); 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); 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) { switch (id) {
case SPA_IO_Buffers: case SPA_IO_Buffers:
port->io = data; port->io = data;