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

alsa-ucm: Set icon names for mappings as well

Browse source 
Commit 88bb0bd7cc ("alsa: Allow to augment ucm port properties") adds
icon properties for some common port names, so that GUIs can show a
relevant icon to help disambiguate devices. However, these still do not
show up in pavucontrol, because it shows icons based on mappings'
properties. Add the relevant property to mappings as well.

Link: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/839
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
This commit is contained in:
Alper Nebi Yasak 2024-12-04 19:48:41 +03:00 • committed by Wim Taymans
parent e726c5f6db
commit 35dbaa840b
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
spa/plugins/alsa/acp/alsa-ucm.c
View file

@ -1092,14 +1092,14 @@ fail:
} }
} }
static void ucm_add_port_props( static void proplist_set_icon_name(
pa_device_port *port, pa_proplist *proplist,
bool is_sink) pa_device_port_type_t type,
{ bool is_sink) {
const char *icon; const char *icon;
if (is_sink) { if (is_sink) {
switch (port->type) { switch (type) {
case PA_DEVICE_PORT_TYPE_HEADPHONES: case PA_DEVICE_PORT_TYPE_HEADPHONES:
icon = "audio-headphones"; icon = "audio-headphones";
break; break;
@ -1112,7 +1112,7 @@ static void ucm_add_port_props(
break; break;
} }
} else { } else {
switch (port->type) { switch (type) {
case PA_DEVICE_PORT_TYPE_HEADSET: case PA_DEVICE_PORT_TYPE_HEADSET:
icon = "audio-headset"; icon = "audio-headset";
break; break;
@ -1123,7 +1123,7 @@ static void ucm_add_port_props(
} }
} }
pa_proplist_sets(port->proplist, "device.icon_name", icon); pa_proplist_sets(proplist, "device.icon_name", icon);
} }
static char *devset_name(pa_idxset *devices, const char *sep) { static char *devset_name(pa_idxset *devices, const char *sep) {
@ -1229,6 +1229,13 @@ static unsigned devset_capture_priority(pa_idxset *devices, bool invert) {
return (unsigned) priority; return (unsigned) priority;
} }
static void ucm_add_port_props(
pa_device_port *port,
bool is_sink)
{
proplist_set_icon_name(port->proplist, port->type, is_sink);
}
void pa_alsa_ucm_add_port( void pa_alsa_ucm_add_port(
pa_hashmap *hash, pa_hashmap *hash,
pa_alsa_ucm_mapping_context *context, pa_alsa_ucm_mapping_context *context,
@ -1675,6 +1682,8 @@ static void alsa_mapping_add_ucm_device(pa_alsa_mapping *m, pa_alsa_ucm_device *
else else
device->capture_mapping = m; device->capture_mapping = m;
proplist_set_icon_name(m->proplist, device->type, is_sink);
mdev = get_mixer_device(device, is_sink); mdev = get_mixer_device(device, is_sink);
if (mdev) if (mdev)
pa_proplist_sets(m->proplist, "alsa.mixer_device", mdev); pa_proplist_sets(m->proplist, "alsa.mixer_device", mdev);

3
spa/plugins/alsa/alsa-acp-device.c
View file

@ -175,7 +175,7 @@ static int emit_node(struct impl *this, struct acp_device *dev)
info.change_mask = SPA_DEVICE_OBJECT_CHANGE_MASK_PROPS; info.change_mask = SPA_DEVICE_OBJECT_CHANGE_MASK_PROPS;
items = alloca((dev->props.n_items + 10) * sizeof(*items)); items = alloca((dev->props.n_items + 11) * sizeof(*items));
n_items = 0; n_items = 0;
snprintf(card_index, sizeof(card_index), "%d", card->index); snprintf(card_index, sizeof(card_index), "%d", card->index);
@ -192,6 +192,7 @@ static int emit_node(struct impl *this, struct acp_device *dev)
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_API_ALSA_PCM_CARD, card_index); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_API_ALSA_PCM_CARD, card_index);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_API_ALSA_PCM_STREAM, stream); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_API_ALSA_PCM_STREAM, stream);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_PORT_GROUP, stream); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_PORT_GROUP, stream);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_ICON_NAME, "audio-card-analog");
snprintf(channels, sizeof(channels), "%d", dev->format.channels); snprintf(channels, sizeof(channels), "%d", dev->format.channels);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_AUDIO_CHANNELS, channels); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_AUDIO_CHANNELS, channels);