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: handle A2DP inverted ClearConfiguration/SetConfiguration order

Browse source 
When in A2DP sink role and remote end switches codec, BlueZ nowadays
appears sometimes emit first SetConfiguration (creating new transport),
and then ClearConfiguration (removing old transport).

Handle this case: emit profiles_changed event always when transports
come/go.

Redefine profiles_changed() to take bitmask of profiles whose connection
status changed, so we don't need to emit two remove+add events.
This commit is contained in:
Pauli Virtanen 2024-12-05 19:58:20 +02:00
parent 5cbf3654c7
commit 2bf48487cb
3 changed files with 37 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

18
spa/plugins/bluez5/bluez5-dbus.c
View file

@ -2094,13 +2094,11 @@ static void device_update_set_status(struct spa_bt_device *device, bool force, c
int spa_bt_device_connect_profile(struct spa_bt_device *device, enum spa_bt_profile profile)
{
uint32_t prev_connected = device->connected_profiles;
device->connected_profiles |= profile;
if (profile & SPA_BT_PROFILE_BAP_DUPLEX)
device_update_set_status(device, true, NULL);
spa_bt_device_check_profiles(device, false);
if (device->connected_profiles != prev_connected)
spa_bt_device_emit_profiles_changed(device, device->profiles, prev_connected);
spa_bt_device_emit_profiles_changed(device, profile);
return 0;
}
@ -2458,8 +2456,7 @@ static int device_update_props(struct spa_bt_device *device,
}
if (device->profiles != prev_profiles)
spa_bt_device_emit_profiles_changed(
device, prev_profiles, device->connected_profiles);
spa_bt_device_emit_profiles_changed(device, 0);
}
else if (spa_streq(key, "Sets")) {
device_update_device_sets_prop(device, &it[1]);
@ -2943,7 +2940,6 @@ void spa_bt_transport_free(struct spa_bt_transport *transport)
if (device) {
struct spa_bt_transport *t;
uint32_t disconnected = transport->profile;
uint32_t prev_connected = device->connected_profiles;
spa_list_remove(&transport->device_link);
@ -2953,8 +2949,8 @@ void spa_bt_transport_free(struct spa_bt_transport *transport)
if (transport->profile & SPA_BT_PROFILE_BAP_DUPLEX)
device_update_set_status(device, true, NULL);
if (device->connected_profiles != prev_connected)
spa_bt_device_emit_profiles_changed(device, device->profiles, prev_connected);
spa_bt_device_emit_profiles_changed(device, transport->profile);
}
spa_list_remove(&transport->bap_transport_linked);
@ -5568,7 +5564,7 @@ static void interface_added(struct spa_bt_monitor *monitor,
d = ep->device;
if (d)
spa_bt_device_emit_profiles_changed(d, d->profiles, d->connected_profiles);
spa_bt_device_emit_profiles_changed(d, 0);
if (spa_streq(ep->uuid, SPA_BT_UUID_BAP_BROADCAST_SINK)) {
int ret, i;
@ -5662,7 +5658,7 @@ static void interfaces_removed(struct spa_bt_monitor *monitor, DBusMessageIter *
struct spa_bt_device *d = ep->device;
remote_endpoint_free(ep);
if (d)
spa_bt_device_emit_profiles_changed(d, d->profiles, d->connected_profiles);
spa_bt_device_emit_profiles_changed(d, 0);
}
} else if (spa_streq(interface_name, BLUEZ_MEDIA_TRANSPORT_INTERFACE)) {
struct spa_bt_transport *transport;
@ -5930,7 +5926,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
d = ep->device;
if (d)
spa_bt_device_emit_profiles_changed(d, d->profiles, d->connected_profiles);
spa_bt_device_emit_profiles_changed(d, 0);
}
else if (spa_streq(iface, BLUEZ_MEDIA_TRANSPORT_INTERFACE)) {
struct spa_bt_transport *transport;