From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Date: Mon, 7 Mar 2011 18:03:04 +0000 (+0100)
Subject: hdspmixer: Adjust playback channel count on Multiface.
X-Git-Tag: v1.0.25~31
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=53e4a1a44e1e0a66658803dfb402808e5b302749;p=alsa-tools.git

hdspmixer: Adjust playback channel count on Multiface.

The multiface has 18/14 (SS/DS) playback channels, matching the native
18/14 I/O ports. Headphones don't count (only for #destinations).

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/hdspmixer/src/HDSPMixerCard.cxx b/hdspmixer/src/HDSPMixerCard.cxx
index eb51155..cd6a922 100644
--- a/hdspmixer/src/HDSPMixerCard.cxx
+++ b/hdspmixer/src/HDSPMixerCard.cxx
@@ -211,14 +211,14 @@ void HDSPMixerCard::adjustSettings() {
 	switch (speed_mode) {
 	case 0:
 	    channels_input = 18;
-	    channels_playback = 20;
+	    channels_playback = 18;
 	    channel_map_input = channel_map_playback = channel_map_mf_ss;
 	    dest_map = dest_map_mf_ss;
 	    meter_map_input = meter_map_playback = channel_map_mf_ss;
 	    break;
 	case 1:
 	    channels_input = 14;
-	    channels_playback = 16;
+	    channels_playback = 14;
 	    channel_map_input = channel_map_playback = meter_map_ds;
 	    dest_map = dest_map_ds;
 	    meter_map_input = meter_map_playback = meter_map_ds;