mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: deal with adapters appearing after devices

Browse source 
Devices may appear before or after their adapter does on BlueZ DBus
interface.

When an adapter appears, search the device list, and associated its
devices with it.
This commit is contained in:
Pauli Virtanen 2022-01-20 23:55:06 +02:00
parent 88e744a06f
commit ee257b148b
1 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -694,6 +694,22 @@ static int adapter_update_props(struct spa_bt_adapter *adapter,
return 0;
}
static void adapter_update_devices(struct spa_bt_adapter *adapter)
{
struct spa_bt_monitor *monitor = adapter->monitor;
struct spa_bt_device *device;
/*
* Update devices when new adapter appears.
* Devices may appear on DBus before or after the adapter does.
*/
spa_list_for_each(device, &monitor->device_list, link) {
if (device->adapter == NULL && spa_streq(device->adapter_path, adapter->path))
device->adapter = adapter;
}
}
static void adapter_register_player(struct spa_bt_adapter *adapter)
{
if (adapter->player_registered || !adapter->monitor->dummy_avrcp_player)
@ -1373,7 +1389,7 @@ static int device_update_props(struct spa_bt_device *device,
device->adapter = adapter_find(monitor, value);
if (device->adapter == NULL) {
spa_log_warn(monitor->log, "unknown adapter %s", value);
spa_log_info(monitor->log, "unknown adapter %s", value);
}
}
else if (spa_streq(key, "Icon")) {
@ -3621,6 +3637,7 @@ static void interface_added(struct spa_bt_monitor *monitor,
adapter_update_props(a, props_iter, NULL);
adapter_register_application(a);
adapter_register_player(a);
adapter_update_devices(a);
}
else if (spa_streq(interface_name, BLUEZ_PROFILE_MANAGER_INTERFACE)) {
if (monitor->backends[BACKEND_NATIVE])