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

device: handle device remove, clean up nodes

Browse source
This commit is contained in:
Wim Taymans 2018-11-23 13:12:03 +01:00
parent e1bd12e599
commit 0a88805743
1 changed files with 53 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/pipewire/device.c
View file

@ -39,6 +39,7 @@ struct node_data {
struct pw_node *node; struct pw_node *node;
struct spa_handle *handle; struct spa_handle *handle;
uint32_t id; uint32_t id;
struct spa_hook node_listener;
}; };
struct pw_device *pw_device_new(struct pw_core *core, struct pw_device *pw_device_new(struct pw_core *core,
@ -68,9 +69,14 @@ struct pw_device *pw_device_new(struct pw_core *core,
void pw_device_destroy(struct pw_device *device) void pw_device_destroy(struct pw_device *device)
{ {
struct node_data *nd;
pw_log_debug("device %p: destroy", device); pw_log_debug("device %p: destroy", device);
pw_device_events_destroy(device); pw_device_events_destroy(device);
spa_list_consume(nd, &device->node_list, link)
pw_node_destroy(nd->node);
if (device->registered) if (device->registered)
spa_list_remove(&device->link); spa_list_remove(&device->link);
@ -174,6 +180,19 @@ int pw_device_register(struct pw_device *device,
return 0; return 0;
} }
static void node_destroy(void *data)
{
struct node_data *nd = data;
spa_list_remove(&nd->link);
spa_handle_clear(nd->handle);
}
static const struct pw_node_events node_events = {
PW_VERSION_NODE_EVENTS,
.destroy = node_destroy,
};
static void device_add(void *data, uint32_t id, static void device_add(void *data, uint32_t id,
const struct spa_handle_factory *factory, uint32_t type, const struct spa_handle_factory *factory, uint32_t type,
const struct spa_dict *info) const struct spa_dict *info)
@ -191,6 +210,7 @@ static void device_add(void *data, uint32_t id,
return; return;
} }
pw_log_debug("device %p: add node %d", device, id);
support = pw_core_get_support(device->core, &n_support); support = pw_core_get_support(device->core, &n_support);
node = pw_node_new(device->core, node = pw_node_new(device->core,
@ -219,6 +239,8 @@ static void device_add(void *data, uint32_t id,
goto error;; goto error;;
} }
pw_node_add_listener(node, &nd->node_listener, &node_events, nd);
pw_node_set_implementation(node, iface); pw_node_set_implementation(node, iface);
pw_node_register(node, NULL, device->global, NULL); pw_node_register(node, NULL, device->global, NULL);
pw_node_set_active(node, true); pw_node_set_active(node, true);
@ -230,8 +252,26 @@ error:
return; return;
} }
static struct node_data *find_node(struct pw_device *device, uint32_t id)
{
struct node_data *nd;
spa_list_for_each(nd, &device->node_list, link) {
if (nd->id == id)
return nd;
}
return NULL;
}
static void device_remove(void *data, uint32_t id) static void device_remove(void *data, uint32_t id)
{ {
struct pw_device *device = data;
struct node_data *nd;
pw_log_debug("device %p: remove node %d", device, id);
if ((nd = find_node(device, id)) == NULL)
return;
pw_node_destroy(nd->node);
} }
static const struct spa_device_callbacks device_callbacks = { static const struct spa_device_callbacks device_callbacks = {
@ -243,11 +283,10 @@ static const struct spa_device_callbacks device_callbacks = {
void pw_device_set_implementation(struct pw_device *device, struct spa_device *spa_device) void pw_device_set_implementation(struct pw_device *device, struct spa_device *spa_device)
{ {
device->implementation = spa_device; device->implementation = spa_device;
spa_device_set_callbacks(device->implementation, &device_callbacks, device);
if (spa_device && spa_device->info) if (spa_device && spa_device->info)
pw_device_update_properties(device, spa_device->info); pw_device_update_properties(device, spa_device->info);
spa_device_set_callbacks(device->implementation, &device_callbacks, device);
} }
struct spa_device *pw_device_get_implementation(struct pw_device *device) struct spa_device *pw_device_get_implementation(struct pw_device *device)