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-dbus: Do not setup ASHA profile for unconnected devices

Browse source 
Do not add/connect the profile for unconnected devices.

This fixes the issue where a previously paired ASHA device
would show up in the pavucontrol output device list even
when not connected.
This commit is contained in:
Sanchayan Maity 2025-01-27 11:03:55 +05:30 • committed by Wim Taymans
parent ce31e66fb7
commit 23ae55015d
1 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2803,14 +2803,8 @@ next:
spa_bt_device_add_profile(remote_endpoint->device, profile); spa_bt_device_add_profile(remote_endpoint->device, profile);
if (spa_streq(remote_endpoint->uuid, SPA_BT_UUID_ASHA_SINK)) { if (spa_streq(remote_endpoint->uuid, SPA_BT_UUID_ASHA_SINK)) {
if (profile & SPA_BT_PROFILE_ASHA_SINK) { if (profile & SPA_BT_PROFILE_ASHA_SINK)
if (setup_asha_transport(remote_endpoint, monitor)) { setup_asha_transport(remote_endpoint, monitor);
spa_log_error(monitor->log, "Failed to create transport for remote_endpoint %p", remote_endpoint);
} else {
spa_log_debug(monitor->log, "Adding profile for remote_endpoint %p: device -> %p", remote_endpoint, remote_endpoint->device);
spa_bt_device_add_profile(remote_endpoint->device, SPA_BT_PROFILE_ASHA_SINK);
}
}
} }
} }
@ -4095,8 +4089,10 @@ static int setup_asha_transport(struct spa_bt_remote_endpoint *remote_endpoint,
struct spa_bt_transport *transport; struct spa_bt_transport *transport;
char *tpath; char *tpath;
if (!remote_endpoint->transport_path) if (!remote_endpoint->transport_path) {
spa_log_error(monitor->log, "Missing ASHA transport path");
return -EINVAL; return -EINVAL;
}
transport = spa_bt_transport_find(monitor, remote_endpoint->transport_path); transport = spa_bt_transport_find(monitor, remote_endpoint->transport_path);
if (transport != NULL) { if (transport != NULL) {
@ -5678,14 +5674,7 @@ static void interface_added(struct spa_bt_monitor *monitor,
/* Trigger bluez device creation before bluez profile negotiation started so that /* Trigger bluez device creation before bluez profile negotiation started so that
* profile connection handlers can receive per-device settings during profile negotiation. */ * profile connection handlers can receive per-device settings during profile negotiation. */
if (d->profiles & SPA_BT_PROFILE_ASHA_SINK) { spa_bt_device_add_profile(d, SPA_BT_PROFILE_NULL);
spa_log_info(monitor->log, "Add profile %s: %m",
object_path);
spa_bt_device_add_profile(d, SPA_BT_PROFILE_ASHA_SINK);
spa_bt_device_connect_profile(d, SPA_BT_PROFILE_ASHA_SINK);
}
else
spa_bt_device_add_profile(d, SPA_BT_PROFILE_NULL);
} }
else if (spa_streq(interface_name, BLUEZ_DEVICE_SET_INTERFACE)) { else if (spa_streq(interface_name, BLUEZ_DEVICE_SET_INTERFACE)) {
device_set_update_props(monitor, object_path, props_iter, NULL); device_set_update_props(monitor, object_path, props_iter, NULL);