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-mixer: handle interface type (CARD,PCM) for mixer element lookups

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-12-07 17:54:04 +01:00 • committed by Arun Raghavan
parent dacfcbb09c
commit f18b0c3402
5 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/alsa/module-alsa-card.c
View file

@ -588,7 +588,7 @@ static void init_eld_ctls(struct userdata *u) {
if (device < 0)
continue;
melem = pa_alsa_mixer_find(u->mixer_handle, "ELD", device);
melem = pa_alsa_mixer_find_pcm(u->mixer_handle, "ELD", device);
if (melem) {
snd_mixer_elem_set_callback(melem, hdmi_eld_changed);
snd_mixer_elem_set_callback_private(melem, u);
@ -635,7 +635,7 @@ static void init_jacks(struct userdata *u) {
u->mixer_handle = pa_alsa_open_mixer(u->alsa_card_index, NULL);
if (u->mixer_handle && pa_alsa_fdlist_set_handle(u->mixer_fdl, u->mixer_handle, NULL, u->core->mainloop) >= 0) {
PA_HASHMAP_FOREACH(jack, u->jacks, state) {
jack->melem = pa_alsa_mixer_find(u->mixer_handle, jack->alsa_name, 0);
jack->melem = pa_alsa_mixer_find_card(u->mixer_handle, jack->alsa_name, 0);
if (!jack->melem) {
pa_log_warn("Jack '%s' seems to have disappeared.", jack->alsa_name);
pa_alsa_jack_set_has_control(jack, false);