mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

acp: sync with master

Browse source
This commit is contained in:
Wim Taymans 2020-07-13 14:39:27 +02:00
parent be7ff66d0b
commit a459c1f226
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
spa/plugins/alsa/acp/alsa-ucm.c
View file

@ -920,14 +920,15 @@ static void probe_volumes(pa_hashmap *hash, bool is_sink, snd_pcm_t *pcm_handle,
mdev = NULL;
PA_DYNARRAY_FOREACH(dev, data->devices, idx) {
mdev2 = get_mixer_device(dev, is_sink);
if (mdev && !pa_streq(mdev, mdev2)) {
if (mdev && mdev2 && !pa_streq(mdev, mdev2)) {
pa_log_error("Two mixer device names found ('%s', '%s'), using s/w volume", mdev, mdev2);
goto fail;
}
mdev = mdev2;
if (mdev2)
mdev = mdev2;
}
if (!(mixer_handle = pa_alsa_open_mixer_by_name(mixers, mdev, true))) {
if (mdev == NULL || !(mixer_handle = pa_alsa_open_mixer_by_name(mixers, mdev, true))) {
pa_log_error("Failed to find a working mixer device (%s).", mdev);
goto fail;
}