mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

acp: disable path_select when using soft-mixer

Browse source 
When using the soft mixer we should not use path_select because that one
will also touch the mixer and try to mute some switches.

Fixes #4311
This commit is contained in:
Wim Taymans 2024-09-23 15:34:08 +02:00
parent e095a1c4ac
commit 322829cb2e
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
spa/plugins/alsa/acp/acp.c
View file

@ -1377,7 +1377,8 @@ static int setup_mixer(pa_card *impl, pa_alsa_device *dev, bool ignore_dB)
data = PA_DEVICE_PORT_DATA(dev->active_port);
dev->mixer_path = data->path;
pa_alsa_path_select(data->path, data->setting, dev->mixer_handle, dev->muted);
if (!impl->soft_mixer)
pa_alsa_path_select(data->path, data->setting, dev->mixer_handle, dev->muted);
} else {
pa_alsa_ucm_port_data *data;
@ -1386,7 +1387,8 @@ static int setup_mixer(pa_card *impl, pa_alsa_device *dev, bool ignore_dB)
/* Now activate volume controls, if any */
if (data->path) {
dev->mixer_path = data->path;
pa_alsa_path_select(dev->mixer_path, NULL, dev->mixer_handle, dev->muted);
if (!impl->soft_mixer)
pa_alsa_path_select(dev->mixer_path, NULL, dev->mixer_handle, dev->muted);
}
}
} else {
@ -1395,8 +1397,9 @@ static int setup_mixer(pa_card *impl, pa_alsa_device *dev, bool ignore_dB)
if (dev->mixer_path) {
/* Hmm, we have only a single path, then let's activate it */
pa_alsa_path_select(dev->mixer_path, dev->mixer_path->settings,
dev->mixer_handle, dev->muted);
if (!impl->soft_mixer)
pa_alsa_path_select(dev->mixer_path, dev->mixer_path->settings,
dev->mixer_handle, dev->muted);
} else
return 0;
}
@ -1864,6 +1867,7 @@ int acp_card_handle_events(struct acp_card *card)
static void sync_mixer(pa_alsa_device *d, pa_device_port *port)
{
pa_alsa_setting *setting = NULL;
pa_card *impl = d->card;
if (!d->mixer_path)
return;
@ -1876,7 +1880,7 @@ static void sync_mixer(pa_alsa_device *d, pa_device_port *port)
setting = data->setting;
}
if (d->mixer_handle)
if (d->mixer_handle && !impl->soft_mixer)
pa_alsa_path_select(d->mixer_path, setting, d->mixer_handle, d->muted);
if (d->set_mute)