mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa-ucm: Set icon names for mappings as well

Browse source 
A previous commit 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.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
This commit is contained in:
Alper Nebi Yasak 2023-11-26 23:32:06 +03:00
parent fa7fe111cb
commit 2dcb4fd402
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/modules/alsa/alsa-ucm.c
View file

@ -1208,14 +1208,14 @@ static unsigned devset_capture_priority(pa_idxset *devices, bool invert) {
return (unsigned) priority;
}
static void ucm_add_port_props(
pa_device_port *port,
bool is_sink)
{
static void proplist_set_icon_name(
pa_proplist *proplist,
pa_device_port_type_t type,
bool is_sink) {
const char *icon;
if (is_sink) {
switch (port->type) {
switch (type) {
case PA_DEVICE_PORT_TYPE_HEADPHONES:
icon = "audio-headphones";
break;
@ -1228,7 +1228,7 @@ static void ucm_add_port_props(
break;
}
} else {
switch (port->type) {
switch (type) {
case PA_DEVICE_PORT_TYPE_HEADSET:
icon = "audio-headset";
break;
@ -1239,7 +1239,14 @@ static void ucm_add_port_props(
}
}
pa_proplist_sets(port->proplist, "device.icon_name", icon);
pa_proplist_sets(proplist, PA_PROP_DEVICE_ICON_NAME, icon);
}
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(
@ -1690,6 +1697,8 @@ static void alsa_mapping_add_ucm_device(pa_alsa_mapping *m, pa_alsa_ucm_device *
else
device->capture_mapping = m;
proplist_set_icon_name(m->proplist, device->type, is_sink);
mdev = get_mixer_device(device, is_sink);
if (mdev)
pa_proplist_sets(m->proplist, "alsa.mixer_device", mdev);