mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez: clean up nodes

Browse source
This commit is contained in:
Wim Taymans 2019-07-31 18:30:19 +02:00
parent a79e6737a9
commit 2772c9f554
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
spa/plugins/bluez5/a2dp-sink.c
View file

@ -864,7 +864,7 @@ static int do_remove_source(struct spa_loop *loop,
static int do_stop(struct impl *this) static int do_stop(struct impl *this)
{ {
int res; int res = 0;
if (!this->started) if (!this->started)
return 0; return 0;
@ -875,7 +875,8 @@ static int do_stop(struct impl *this)
this->started = false; this->started = false;
res = spa_bt_transport_release(this->transport); if (this->transport)
res = spa_bt_transport_release(this->transport);
return res; return res;
} }

14
src/examples/bluez-monitor.c
View file

@ -136,7 +136,7 @@ static struct bluez5_node *bluez5_create_node(struct bluez5_object *obj, uint32_
NULL, NULL,
PW_TYPE_INTERFACE_Node, PW_TYPE_INTERFACE_Node,
PW_VERSION_NODE_PROXY, PW_VERSION_NODE_PROXY,
node->props, pw_properties_copy(node->props),
0); 0);
if (node->adapter == NULL) { if (node->adapter == NULL) {
res = -errno; res = -errno;
@ -144,7 +144,8 @@ static struct bluez5_node *bluez5_create_node(struct bluez5_object *obj, uint32_
} }
node->proxy = pw_remote_export(impl->remote, node->proxy = pw_remote_export(impl->remote,
PW_TYPE_INTERFACE_Node, PW_TYPE_INTERFACE_Node,
node->props, node->adapter, 0); pw_properties_copy(node->props),
node->adapter, 0);
spa_list_append(&obj->node_list, &node->link); spa_list_append(&obj->node_list, &node->link);
@ -164,7 +165,8 @@ static void bluez5_remove_node(struct bluez5_object *obj, struct bluez5_node *no
{ {
pw_log_debug("remove node %u", node->id); pw_log_debug("remove node %u", node->id);
spa_list_remove(&node->link); spa_list_remove(&node->link);
pw_proxy_destroy(node->proxy); pw_node_destroy(node->adapter);
pw_properties_free(node->props);
free(node); free(node);
} }
@ -284,9 +286,15 @@ exit:
static void bluez5_remove_object(struct monitor *monitor, struct bluez5_object *obj) static void bluez5_remove_object(struct monitor *monitor, struct bluez5_object *obj)
{ {
struct bluez5_node *node;
pw_log_debug("remove object %u", obj->id); pw_log_debug("remove object %u", obj->id);
spa_list_remove(&obj->link); spa_list_remove(&obj->link);
spa_hook_remove(&obj->device_listener); spa_hook_remove(&obj->device_listener);
spa_list_consume(node, &obj->node_list, link)
bluez5_remove_node(obj, node);
pw_proxy_destroy(obj->proxy); pw_proxy_destroy(obj->proxy);
pw_unload_spa_handle(obj->handle); pw_unload_spa_handle(obj->handle);
free(obj); free(obj);