]> git.alsa-project.org Git - alsa-lib.git/commitdiff
Fix the handling of stereo capture source
authorTakashi Iwai <tiwai@suse.de>
Fri, 2 Dec 2005 13:39:24 +0000 (13:39 +0000)
committerTakashi Iwai <tiwai@suse.de>
Fri, 2 Dec 2005 13:39:24 +0000 (13:39 +0000)
Patch from bug#1610

The simple mixer doesn't handle the stereo "Capture Source" properly,
wrongly set cswitch-joined.

src/mixer/simple_none.c

index eed8f5df7db36e2d154dfb1827514dcb76effcee..359402910136818c8879f1e31606983a1917b590 100644 (file)
@@ -768,7 +768,9 @@ static int simple_update(snd_mixer_elem_t *melem)
        if (cchannels > 1) {
                if (simple->ctls[CTL_CAPTURE_ROUTE].elem ||
                    (simple->ctls[CTL_CAPTURE_SWITCH].elem &&
-                    simple->ctls[CTL_CAPTURE_SWITCH].values > 1)) {
+                    simple->ctls[CTL_CAPTURE_SWITCH].values > 1) ||
+                   (simple->ctls[CTL_CAPTURE_SOURCE].elem &&
+                    simple->ctls[CTL_CAPTURE_SOURCE].values > 1)) {
                        caps &= ~SM_CAP_CSWITCH_JOIN;
                }
                if (simple->ctls[CTL_CAPTURE_VOLUME].elem &&