mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2026-02-05 04:06:31 -05:00
alsa: Allow to augment ucm port properties
Since UCM doesn't perform the path lookups of alsa-mixer all UCM devices
fall back to the card's properties for e.g. icons and hence usually show
the `audio-card` icon for all ports giving a confusing UI to users as
all ports show the same icon.
As ucm names are pretty standard augment some common port names with
icons.
Link: 88bb0bd7cc
This commit is contained in:
parent
3e2bb8a1ec
commit
fa7fe111cb
1 changed files with 35 additions and 0 deletions
|
|
@ -1208,6 +1208,40 @@ 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)
|
||||
{
|
||||
const char *icon;
|
||||
|
||||
if (is_sink) {
|
||||
switch (port->type) {
|
||||
case PA_DEVICE_PORT_TYPE_HEADPHONES:
|
||||
icon = "audio-headphones";
|
||||
break;
|
||||
case PA_DEVICE_PORT_TYPE_HDMI:
|
||||
icon = "video-display";
|
||||
break;
|
||||
case PA_DEVICE_PORT_TYPE_SPEAKER:
|
||||
default:
|
||||
icon = "audio-speakers";
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
switch (port->type) {
|
||||
case PA_DEVICE_PORT_TYPE_HEADSET:
|
||||
icon = "audio-headset";
|
||||
break;
|
||||
case PA_DEVICE_PORT_TYPE_MIC:
|
||||
default:
|
||||
icon = "audio-input-microphone";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
pa_proplist_sets(port->proplist, "device.icon_name", icon);
|
||||
}
|
||||
|
||||
void pa_alsa_ucm_add_port(
|
||||
pa_hashmap *hash,
|
||||
pa_alsa_ucm_mapping_context *context,
|
||||
|
|
@ -1261,6 +1295,7 @@ void pa_alsa_ucm_add_port(
|
|||
|
||||
pa_hashmap_put(ports, port->name, port);
|
||||
pa_log_debug("Add port %s: %s", port->name, port->description);
|
||||
ucm_add_port_props(port, is_sink);
|
||||
|
||||
PA_HASHMAP_FOREACH_KV(verb_name, vol, is_sink ? dev->playback_volumes : dev->capture_volumes, state) {
|
||||
pa_alsa_path *path = pa_alsa_path_synthesize(vol->mixer_elem,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue