From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 6 Sep 2022 12:36:45 +0000 (+0200)
Subject: USB-Audio: ALC4080 - fix PCM,1 mixer control value settings
X-Git-Tag: v1.2.8~25
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=593257c616fe47d46c7b8618f0fd0c4551938876;p=alsa-ucm-conf.git

USB-Audio: ALC4080 - fix PCM,1 mixer control value settings

BugLink: https://github.com/alsa-project/alsa-ucm-conf/issues/210
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf b/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf
index e371616..57d6d6d 100644
--- a/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf
+++ b/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf
@@ -1,25 +1,30 @@
 Define {
 	SpeakerMixer "PCM"
+	SpeakerMindex "0"
 	SpeakerJack "Speaker - Output Jack"
 	SpeakerPCM "hw:${CardId}"
 
 	HeadphonesName "Front Headphones"
-	HeadphonesMixer "PCM,1"
+	HeadphonesMixer "PCM"
+	HeadphonesMindex "1"
 	HeadphonesJack "Headphone - Output Jack"
 	HeadphonesPCM "hw:${CardId},1"
 
 	Mic1Name "Microphone"
 	Mic1Mixer "Mic"
+	Mic1Mindex "0"
 	Mic1Jack "Mic - Input Jack"
 	Mic1PCM "hw:${CardId},2"
 
 	Mic2Name ""
 	Mic2Mixer ""
+	Mic2Mindex "0"
 	Mic2Jack ""
 	Mic2PCM ""
 
 	Line1Name "Line Input"
 	Line1Mixer "Line"
+	Line1Mindex "0"
 	Line1Jack "Line - Input Jack"
 	Line1PCM "hw:${CardId},1"
 
@@ -67,11 +72,11 @@ SectionDevice."Speaker" {
 	Comment "Speakers"
 
 	EnableSequence [
-		cset "name='${var:SpeakerMixer} Playback Switch' on"
+		cset "name='${var:SpeakerMixer} Playback Switch',index=${var:SpeakerMindex} on"
 	]
 
 	DisableSequence [
-		cset "name='${var:SpeakerMixer} Playback Switch' off"
+		cset "name='${var:SpeakerMixer} Playback Switch',index=${var:SpeakerMindex} off"
 	]
 
 	Value {
@@ -79,7 +84,7 @@ SectionDevice."Speaker" {
 		PlaybackPriority 200
 		PlaybackPCM "${var:SpeakerPCM}"
 		JackControl "${var:SpeakerJack}"
-		PlaybackMixerElem "${var:SpeakerMixer}"
+		PlaybackMixerElem "${var:SpeakerMixer},${var:SpeakerMindex}"
 	}
 
 	Variant."HiFi 5+1".Value.PlaybackChannels 6
@@ -95,18 +100,18 @@ If.headphones {
 		Comment "${var:HeadphonesName}"
 
 		EnableSequence [
-			cset "name='${var:HeadphonesMixer} Playback Switch' on"
+			cset "name='${var:HeadphonesMixer} Playback Switch',index=${var:HeadphonesMindex} on"
 		]
 
 		DisableSequence [
-			cset "name='${var:HeadphonesMixer} Playback Switch' off"
+			cset "name='${var:HeadphonesMixer} Playback Switch',index=${var:HeadphonesMindex} off"
 		]
 
 		Value {
 			PlaybackPriority 300
 			PlaybackPCM "${var:HeadphonesPCM}"
 			JackControl "${var:HeadphonesJack}"
-			PlaybackMixerElem "${var:HeadphonesMixer}"
+			PlaybackMixerElem "${var:HeadphonesMixer},${var:HeadphonesMindex}"
 		}
 	}
 }
@@ -135,18 +140,18 @@ If.line1 {
 		Comment "${var:Line1Name}"
 
 		EnableSequence [
-			cset "name='${var:Line1Mixer} Capture Switch' on"
+			cset "name='${var:Line1Mixer} Capture Switch',index=${var:Line1Mindex} on"
 		]
 
 		DisableSequence [
-			cset "name='${var:Line1Mixer} Capture Switch' off"
+			cset "name='${var:Line1Mixer} Capture Switch',index=${var:Line1Mindex} off"
 		]
 
 		Value {
 			CapturePriority 100
 			CapturePCM "${var:Line1PCM}"
 			JackControl "${var:Line1Jack}"
-			CaptureMixerElem "${var:Line1Mixer}"
+			CaptureMixerElem "${var:Line1Mixer},${var:Line1Mindex}"
 		}
 	}
 }
@@ -160,18 +165,18 @@ If.mic1 {
 		Comment "${var:Mic1Name}"
 
 		EnableSequence [
-			cset "name='${var:Mic1Mixer} Capture Switch' on"
+			cset "name='${var:Mic1Mixer} Capture Switch',index=${var:Mic1Mindex} on"
 		]
 
 		DisableSequence [
-			cset "name='${var:Mic1Mixer} Capture Switch' off"
+			cset "name='${var:Mic1Mixer} Capture Switch',index=${var:Mic1Mindex} off"
 		]
 
 		Value {
 			CapturePriority 300
 			CapturePCM "${var:Mic1PCM}"
 			JackControl "${var:Mic1Jack}"
-			CaptureMixerElem "${var:Mic1Mixer}"
+			CaptureMixerElem "${var:Mic1Mixer},${var:Mic1Mindex}"
 		}
 	}
 }
@@ -185,18 +190,18 @@ If.mic2 {
 		Comment "${var:Mic2Name}"
 
 		EnableSequence [
-			cset "name='${var:Mic2Mixer} Capture Switch' on"
+			cset "name='${var:Mic2Mixer} Capture Switch',index=${var:Mic2Mindex} on"
 		]
 
 		DisableSequence [
-			cset "name='${var:Mic2Mixer} Capture Switch' off"
+			cset "name='${var:Mic2Mixer} Capture Switch',index=${var:Mic2Mindex} off"
 		]
 
 		Value {
 			CapturePriority 400
 			CapturePCM "hw:${CardId}"
 			JackControl "${var:Mic2Jack}"
-			CaptureMixerElem "${var:Mic2Mixer}"
+			CaptureMixerElem "${var:Mic2Mixer},${var:Mic2Mindex}"
 		}
 	}
 }