mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-08 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa-ucm: Fix more instances of profile-verb conflation

Browse source 
The ucm_get_device_property() function adds to each UCM device's
playback_volumes (or capture_volumes) hash map an associated volume
mixer keyed with the UCM verb. These key-value pairs are then iterated
over in various places which assume the key is a profile name. This
assumption is no longer true since we can generate multiple profiles to
use conflicting devices.

A previous commit 45278904167f ("alsa-ucm: Stop conflating profile name
with UCM verb name") fixes some instances of this assumption, but misses
the relation explained above. Fix more instances of misleading
"profile"s where the UCM verb name is actually meant.

Link: 7005eafee3
Fixes: 57295beee1a6 ("alsa-ucm: Stop conflating profile name with UCM verb name")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
This commit is contained in:
Alper Nebi Yasak 2023-11-28 00:19:54 +03:00 • committed by Wim Taymans
parent d2046adcd1
commit a7e9f79cd0
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spa/plugins/alsa/acp/alsa-ucm.h
View file

@ -282,9 +282,9 @@ struct pa_alsa_ucm_port_data {
pa_alsa_ucm_device *device;
/* profile name -> pa_alsa_path for volume control */
/* verb name -> pa_alsa_path for volume control */
pa_hashmap *paths;
/* Current path, set when activating profile */
/* Current path, set when activating verb */
pa_alsa_path *path;
/* ELD info */