mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-02 09:01:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa-ucm: do not try to use UCM device name as jack name by default

Browse source 
Remove the implicit rule. It is perfectly ok to have the jack with
the same name for another I/O in the driver. Trust only the
value obtained from UCM.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-12-06 15:43:04 +01:00 • committed by Arun Raghavan
parent 4c64f73c97
commit ef1df94627
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1522,9 +1522,8 @@ static pa_alsa_jack* ucm_get_jack(pa_alsa_ucm_config *ucm, pa_alsa_ucm_device *d
* end, so drop the trailing " Jack". */ * end, so drop the trailing " Jack". */
name = pa_xstrndup(jack_control, strlen(jack_control) - 5); name = pa_xstrndup(jack_control, strlen(jack_control) - 5);
} else { } else {
/* The jack control hasn't been explicitly configured - try a jack name /* The jack control hasn't been explicitly configured, fail. */
* that is the same as the device name. */ return NULL;
name = pa_xstrdup(device_name);
} }
PA_LLIST_FOREACH(j, ucm->jacks) PA_LLIST_FOREACH(j, ucm->jacks)
@ -1603,7 +1602,8 @@ static int ucm_create_profile(
ucm_create_mapping(ucm, ps, p, dev, verb_name, name, sink, source); ucm_create_mapping(ucm, ps, p, dev, verb_name, name, sink, source);
jack = ucm_get_jack(ucm, dev); jack = ucm_get_jack(ucm, dev);
device_set_jack(dev, jack); if (jack)
device_set_jack(dev, jack);
/* JackHWMute contains a list of device names. Each listed device must /* JackHWMute contains a list of device names. Each listed device must
* be associated with the jack object that we just created. */ * be associated with the jack object that we just created. */