USB-Audio: ALC4080 - use PCM device indexes rather than full names in variables

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 6719ebe3d130885fbb63f705b1514663428182c0..6b8811199a15d4635e72f85ca1f3257bbdfa233c 100644 (file)
--- a/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf
+++ b/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf
@@ -12,19 +12,19 @@ Define {
        SpeakerMixer "PCM"
        SpeakerMindex "0"
        SpeakerJack "Speaker - Output Jack"
-       SpeakerPCM "hw:${CardId}"
+       SpeakerPCM "0"
 
        HeadphonesName "Front Headphones"
        HeadphonesMixer "PCM"
        HeadphonesMindex "1"
        HeadphonesJack "Headphone - Output Jack"
-       HeadphonesPCM "hw:${CardId},1"
+       HeadphonesPCM "1"
 
        Mic1Name "Microphone"
        Mic1Mixer "Mic"
        Mic1Mindex "0"
        Mic1Jack "Mic - Input Jack"
-       Mic1PCM "hw:${CardId},2"
+       Mic1PCM "2"
 
        Mic2Name ""
        Mic2Mixer ""
@@ -36,10 +36,10 @@ Define {
        Line1Mixer "Line"
        Line1Mindex "0"
        Line1Jack "Line - Input Jack"
-       Line1PCM "hw:${CardId},1"
+       Line1PCM "1"
 
        SpdifName "S/PDIF Output"
-       SpdifPCM "hw:${CardId},3"
+       SpdifPCM "3"
        SpdifMixer "PCM"
        SpdifMindex "2"
 }
@@ -89,7 +89,7 @@ If.spdif_dev2 {
                String "${CardComponents}"
                Regex "USB(0b05:(1996|1a5[23c])|0db0:1feb)"
        }
-       True.Define.SpdifPCM "hw:${CardId},2"
+       True.Define.SpdifPCM "2"
 }
 
 If.gigabyte-aorus-ultra {
@@ -100,12 +100,12 @@ If.gigabyte-aorus-ultra {
        }
        True.Define {
                Mic1Name "Front Microphone"
-               Mic1PCM "hw:${CardId},0"
+               Mic1PCM "0"
                Mic2Name "Rear Microphone"
                Mic2Mixer "Mic"
                Mic2Mindex "1"
                Mic2Jack "name='Mic - Input Jack',index=1"
-               Mic2PCM "hw:${CardId},1"
+               Mic2PCM "1"
                SpdifName ""
                Line1Name ""
        }
@@ -122,7 +122,7 @@ If.asus-rog-usb {
                Mic2Name "Microphone"
                Mic2Mixer "Analog In"
                Mic2Jack "Analog In - Input Jack"
-               Mic2PCM "hw:${CardId}"
+               Mic2PCM "0"
        }
 }
 
@@ -135,11 +135,11 @@ If.asrock-taichi {
        True.Define {
                Line1Name ""
                Mic1Name "Rear Input"
-               Mic1PCM "hw:${CardId},0"
+               Mic1PCM "0"
                Mic2Name "Front Microphone"
                Mic2Mixer "Mic"
                Mic2Jack "Front Mic - Input Jack"
-               Mic2PCM "hw:${CardId},1"
+               Mic2PCM "1"
        }
 }
 
@@ -153,7 +153,7 @@ If.wrx80-sage {
                Mic2Name "Front Microphone"
                Mic2Mixer "Analog In"
                Mic2Jack "Analog In - Input Jack"
-               Mic2PCM "hw:${CardId}"
+               Mic2PCM "0"
        }
 }
 
@@ -176,7 +176,7 @@ If.asus-rog-strix {
                Regex "USB(0b05:1999)"
        }
        True.Define {
-               Line1PCM "hw:${CardId},3"
+               Line1PCM "3"
                HeadphonesName ""
                SpdifName ""
        }
@@ -204,7 +204,7 @@ SectionDevice."Speaker" {
        Value {
                PlaybackChannels 2
                PlaybackPriority 200
-               PlaybackPCM "${var:SpeakerPCM}"
+               PlaybackPCM "hw:{CardId},${var:SpeakerPCM}"
                JackControl "${var:SpeakerJack}"
                PlaybackMixerElem "${var:SpeakerMixer},${var:SpeakerMindex}"
        }
@@ -231,7 +231,7 @@ If.headphones {
 
                Value {
                        PlaybackPriority 300
-                       PlaybackPCM "${var:HeadphonesPCM}"
+                       PlaybackPCM "hw:${CardId},${var:HeadphonesPCM}"
                        JackControl "${var:HeadphonesJack}"
                        PlaybackMixerElem "${var:HeadphonesMixer},${var:HeadphonesMindex}"
                }
@@ -256,7 +256,7 @@ If.spdif {
 
                Value {
                        PlaybackPriority 100
-                       PlaybackPCM "${var:SpdifPCM}"
+                       PlaybackPCM "hw:${CardId},${var:SpdifPCM}"
                        PlaybackMixerElem "${var:SpdifMixer},${var:SpdifMindex}"
                }
        }
@@ -280,7 +280,7 @@ If.line1 {
 
                Value {
                        CapturePriority 100
-                       CapturePCM "${var:Line1PCM}"
+                       CapturePCM "hw:${CardId},${var:Line1PCM}"
                        JackControl "${var:Line1Jack}"
                        CaptureMixerElem "${var:Line1Mixer},${var:Line1Mindex}"
                }
@@ -305,7 +305,7 @@ If.mic1 {
 
                Value {
                        CapturePriority 300
-                       CapturePCM "${var:Mic1PCM}"
+                       CapturePCM "hw:${CardId},${var:Mic1PCM}"
                        JackControl "${var:Mic1Jack}"
                        CaptureMixerElem "${var:Mic1Mixer},${var:Mic1Mindex}"
                }
@@ -330,7 +330,7 @@ If.mic2 {
 
                Value {
                        CapturePriority 400
-                       CapturePCM "${var:Mic2PCM}"
+                       CapturePCM "hw:${CardId},${var:Mic2PCM}"
                        JackControl "${var:Mic2Jack}"
                        CaptureMixerElem "${var:Mic2Mixer},${var:Mic2Mindex}"
                }