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: deal with device removal while we're switching the codec

Browse source 
Don't remove devices when there's a codec switch active, but check if
they should be removed once it completes.
This commit is contained in:
Pauli Virtanen 2021-01-29 17:35:39 +02:00 • committed by Wim Taymans
parent 5d97351970
commit 8ffde47080
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -593,7 +593,7 @@ int spa_bt_device_check_profiles(struct spa_bt_device *device, bool force)
spa_log_debug(monitor->log, "device %p: profiles %08x %08x %d", spa_log_debug(monitor->log, "device %p: profiles %08x %08x %d",
device, device->profiles, connected_profiles, device->added); device, device->profiles, connected_profiles, device->added);
if (connected_profiles == 0) { if (connected_profiles == 0 && device->active_codec_switch == NULL) {
if (device->added) { if (device->added) {
device_stop_timer(device); device_stop_timer(device);
device_remove(monitor, device); device_remove(monitor, device);
@ -1617,6 +1617,7 @@ static void a2dp_codec_switch_process(struct spa_bt_a2dp_codec_switch *sw)
spa_log_info(sw->device->monitor->log, NAME": a2dp codec switch %p: failed to get an endpoint", sw); spa_log_info(sw->device->monitor->log, NAME": a2dp codec switch %p: failed to get an endpoint", sw);
sw->device->active_codec_switch = NULL; sw->device->active_codec_switch = NULL;
spa_bt_device_emit_codec_switched(sw->device, -ENODEV); spa_bt_device_emit_codec_switched(sw->device, -ENODEV);
spa_bt_device_check_profiles(sw->device, false);
a2dp_codec_switch_free(sw); a2dp_codec_switch_free(sw);
} }
@ -1647,11 +1648,9 @@ static void a2dp_codec_switch_reply(DBusPendingCall *pending, void *user_data)
if (r == NULL) { if (r == NULL) {
spa_log_error(sw->device->monitor->log, spa_log_error(sw->device->monitor->log,
NAME": a2dp codec switch %p: empty reply from dbus, stopping", NAME": a2dp codec switch %p: empty reply from dbus, trying next",
sw); sw);
a2dp_codec_switch_free(sw); goto next;
device->active_codec_switch = NULL;
return;
} }
if (dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR) { if (dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR) {
@ -1668,6 +1667,7 @@ static void a2dp_codec_switch_reply(DBusPendingCall *pending, void *user_data)
spa_log_info(sw->device->monitor->log, NAME": a2dp codec switch %p: success", sw); spa_log_info(sw->device->monitor->log, NAME": a2dp codec switch %p: success", sw);
device->active_codec_switch = NULL; device->active_codec_switch = NULL;
spa_bt_device_emit_codec_switched(sw->device, 0); spa_bt_device_emit_codec_switched(sw->device, 0);
spa_bt_device_check_profiles(sw->device, false);
a2dp_codec_switch_free(sw); a2dp_codec_switch_free(sw);
return; return;