mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-03-26 07:58:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: different icon for A2DP & HFP output routes

Browse source 
Set different icons for A2DP & HFP output routes, so that they look
different (in Gnome).

Don't call the non-HFP output route as "headset" or "handsfree" in this
case, to be less ambiguous about microphone availability.

Also set device.icon-name for the device too.
This commit is contained in:
Pauli Virtanen 2025-05-03 18:19:22 +03:00 • committed by Wim Taymans
parent 9586ef891e
commit 270eda63a9
3 changed files with 71 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1721,8 +1721,9 @@ static void emit_device_info(struct spa_bt_monitor *monitor,
{
struct spa_device_object_info info;
char dev[32], name[128], class[16], vendor_id[64], product_id[64], product_id_tot[67];
struct spa_dict_item items[23];
struct spa_dict_item items[24];
uint32_t n_items = 0;
enum spa_bt_form_factor ff;
info = SPA_DEVICE_OBJECT_INFO_INIT();
info.type = SPA_TYPE_INTERFACE_Device;
@ -1731,6 +1732,8 @@ static void emit_device_info(struct spa_bt_monitor *monitor,
SPA_DEVICE_OBJECT_CHANGE_MASK_PROPS;
info.flags = 0;
ff = spa_bt_form_factor_from_class(device->bluetooth_class);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_API, "bluez5");
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_BUS, "bluetooth");
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_MEDIA_CLASS, "Audio/Device");
@ -1745,9 +1748,8 @@ static void emit_device_info(struct spa_bt_monitor *monitor,
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_VENDOR_ID, vendor_id);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_PRODUCT_ID, product_id_tot);
}
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_FORM_FACTOR,
spa_bt_form_factor_name(
spa_bt_form_factor_from_class(device->bluetooth_class)));
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_FORM_FACTOR, spa_bt_form_factor_name(ff));
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_ICON_NAME, spa_bt_form_factor_icon_name(ff));
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_STRING, device->address);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_API_BLUEZ5_ICON, device->icon);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_API_BLUEZ5_PATH, device->path);