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

alsa-util: do not try to guess the mixer name from the PCM name

Browse source 
This is just invalid. It results to an error in almost all cases.
The hw:<number> scheme is sufficient to get the right card mixer.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-12-06 16:05:07 +01:00 • committed by Arun Raghavan
parent ef1df94627
commit d8200ee805
2 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1725,6 +1725,8 @@ static void ucm_mapping_jack_probe(pa_alsa_mapping *m) {
PA_IDXSET_FOREACH(dev, context->ucm_devices, idx) { PA_IDXSET_FOREACH(dev, context->ucm_devices, idx) {
bool has_control; bool has_control;
if (!dev->jack)
continue;
has_control = pa_alsa_mixer_find(mixer_handle, dev->jack->alsa_name, 0) != NULL; has_control = pa_alsa_mixer_find(mixer_handle, dev->jack->alsa_name, 0) != NULL;
pa_alsa_jack_set_has_control(dev->jack, has_control); pa_alsa_jack_set_has_control(dev->jack, has_control);
pa_log_info("UCM jack %s has_control=%d", dev->jack->name, dev->jack->has_control); pa_log_info("UCM jack %s has_control=%d", dev->jack->name, dev->jack->has_control);

12
src/modules/alsa/alsa-util.c
View file

@ -1743,7 +1743,6 @@ snd_mixer_t *pa_alsa_open_mixer(int alsa_card_index, char **ctl_device) {
snd_mixer_t *pa_alsa_open_mixer_for_pcm(snd_pcm_t *pcm, char **ctl_device) { snd_mixer_t *pa_alsa_open_mixer_for_pcm(snd_pcm_t *pcm, char **ctl_device) {
int err; int err;
snd_mixer_t *m; snd_mixer_t *m;
const char *dev;
snd_pcm_info_t* info; snd_pcm_info_t* info;
snd_pcm_info_alloca(&info); snd_pcm_info_alloca(&info);
@ -1754,15 +1753,6 @@ snd_mixer_t *pa_alsa_open_mixer_for_pcm(snd_pcm_t *pcm, char **ctl_device) {
return NULL; return NULL;
} }
/* First, try by name */
if ((dev = snd_pcm_name(pcm)))
if (prepare_mixer(m, dev) >= 0) {
if (ctl_device)
*ctl_device = pa_xstrdup(dev);
return m;
}
/* Then, try by card index */ /* Then, try by card index */
if (snd_pcm_info(pcm, info) >= 0) { if (snd_pcm_info(pcm, info) >= 0) {
char *md; char *md;
@ -1771,8 +1761,6 @@ snd_mixer_t *pa_alsa_open_mixer_for_pcm(snd_pcm_t *pcm, char **ctl_device) {
if ((card_idx = snd_pcm_info_get_card(info)) >= 0) { if ((card_idx = snd_pcm_info_get_card(info)) >= 0) {
md = pa_sprintf_malloc("hw:%i", card_idx); md = pa_sprintf_malloc("hw:%i", card_idx);
if (!dev || !pa_streq(dev, md))
if (prepare_mixer(m, md) >= 0) { if (prepare_mixer(m, md) >= 0) {
if (ctl_device) if (ctl_device)