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

Revert "alsa-mixer: allow to re-attach the mixer control element"

Browse source 
This reverts commit b554fc20e9.
This commit is contained in:
Wim Taymans 2023-04-14 16:32:18 +02:00
parent f6d4306a37
commit 916f1cdfbf
1 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
spa/plugins/alsa/acp/alsa-util.c
View file

@ -1648,20 +1648,12 @@ static int mixer_class_event(snd_mixer_class_t *class, unsigned int mask,
} else if (mask & SND_CTL_EVENT_MASK_ADD) { } else if (mask & SND_CTL_EVENT_MASK_ADD) {
snd_ctl_elem_iface_t iface = snd_hctl_elem_get_interface(helem); snd_ctl_elem_iface_t iface = snd_hctl_elem_get_interface(helem);
if (iface == SND_CTL_ELEM_IFACE_CARD || iface == SND_CTL_ELEM_IFACE_PCM) { if (iface == SND_CTL_ELEM_IFACE_CARD || iface == SND_CTL_ELEM_IFACE_PCM) {
snd_mixer_t *mixer = snd_mixer_class_get_mixer(class);
snd_ctl_elem_iface_t iface = snd_hctl_elem_get_interface(helem);
const char *name = snd_hctl_elem_get_name(helem);
const int index = snd_hctl_elem_get_index(helem);
const int device = snd_hctl_elem_get_device(helem);
snd_mixer_elem_t *new_melem; snd_mixer_elem_t *new_melem;
new_melem = pa_alsa_mixer_find(mixer, iface, name, index, device); /* Put the hctl pointer as our private data - it will be useful for callbacks */
if (!new_melem) { if ((err = snd_mixer_elem_new(&new_melem, SND_MIXER_ELEM_PULSEAUDIO, 0, helem, NULL)) < 0) {
/* Put the hctl pointer as our private data - it will be useful for callbacks */ pa_log_warn("snd_mixer_elem_new failed: %s", pa_alsa_strerror(err));
if ((err = snd_mixer_elem_new(&new_melem, SND_MIXER_ELEM_PULSEAUDIO, 0, helem, NULL)) < 0) { return 0;
pa_log_warn("snd_mixer_elem_new failed: %s", pa_alsa_strerror(err));
return 0;
}
} }
if ((err = snd_mixer_elem_attach(new_melem, helem)) < 0) { if ((err = snd_mixer_elem_attach(new_melem, helem)) < 0) {