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

bluez5: remove devices correctly

Browse source 
Remember how many devices we emited for the current profile and
remove them all when we switch profile.
This commit is contained in:
Wim Taymans 2020-07-03 16:12:19 +02:00
parent 7b129c1020
commit 7778f8d70e
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
spa/plugins/bluez5/bluez5-device.c
View file

@ -74,6 +74,7 @@ struct impl {
struct spa_bt_device *bt_dev; struct spa_bt_device *bt_dev;
uint32_t profile; uint32_t profile;
uint32_t n_nodes;
}; };
static void emit_node (struct impl *this, struct spa_bt_transport *t, uint32_t id, const char *factory_name) static void emit_node (struct impl *this, struct spa_bt_transport *t, uint32_t id, const char *factory_name)
@ -114,6 +115,8 @@ static int emit_nodes(struct impl *this)
int index = 0; int index = 0;
switch (this->profile) { switch (this->profile) {
case 0:
break;
case 1: case 1:
if (this->bt_dev->connected_profiles & SPA_BT_PROFILE_A2DP_SOURCE) { if (this->bt_dev->connected_profiles & SPA_BT_PROFILE_A2DP_SOURCE) {
t = find_transport(this, SPA_BT_PROFILE_A2DP_SOURCE); t = find_transport(this, SPA_BT_PROFILE_A2DP_SOURCE);
@ -138,7 +141,7 @@ static int emit_nodes(struct impl *this)
break; break;
} }
if (t == NULL) if (t == NULL)
return 0; break;
emit_node(this, t, index++, SPA_NAME_API_BLUEZ5_SCO_SOURCE); emit_node(this, t, index++, SPA_NAME_API_BLUEZ5_SCO_SOURCE);
emit_node(this, t, index++, SPA_NAME_API_BLUEZ5_SCO_SINK); emit_node(this, t, index++, SPA_NAME_API_BLUEZ5_SCO_SINK);
} }
@ -146,26 +149,23 @@ static int emit_nodes(struct impl *this)
default: default:
return -EINVAL; return -EINVAL;
} }
this->n_nodes = index;
return 0; return 0;
} }
static int set_profile(struct impl *this, uint32_t profile) static int set_profile(struct impl *this, uint32_t profile)
{ {
uint32_t i;
if (this->profile == profile) if (this->profile == profile)
return 0; return 0;
switch (this->profile) { for (i = 0; i < this->n_nodes; i++)
case 1: spa_device_emit_object_info(&this->hooks, i, NULL);
spa_device_emit_object_info(&this->hooks, 0, NULL);
break; this->n_nodes = 0;
case 2:
spa_device_emit_object_info(&this->hooks, 0, NULL);
spa_device_emit_object_info(&this->hooks, 1, NULL);
break;
default:
break;
}
this->profile = profile; this->profile = profile;
return emit_nodes(this); return emit_nodes(this);
} }