From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 2 Dec 2005 13:39:24 +0000 (+0000)
Subject: Fix the handling of stereo capture source
X-Git-Tag: v1.0.11rc1~7
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=33a40df1afbcea022e91fae29144bc057086e11f;p=alsa-lib.git

Fix the handling of stereo capture source

Patch from bug#1610

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

diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c
index eed8f5df..35940291 100644
--- a/src/mixer/simple_none.c
+++ b/src/mixer/simple_none.c
@@ -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 &&