HDAudio-Gigabyte-ALC1220DualCodecs: adapt to ucm2

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm/HDAudio-Gigabyte-ALC1220DualCodecs/HDAudio-Gigabyte-ALC1220DualCodecs.conf b/ucm2/HDAudio-Gigabyte-ALC1220DualCodecs/HDAudio-Gigabyte-ALC1220DualCodecs.conf
similarity index 92%
rename from ucm/HDAudio-Gigabyte-ALC1220DualCodecs/HDAudio-Gigabyte-ALC1220DualCodecs.conf
rename to ucm2/HDAudio-Gigabyte-ALC1220DualCodecs/HDAudio-Gigabyte-ALC1220DualCodecs.conf
index 492eebf01aa9359b51c92b14658a678d1225b57a..d406f8f1b73bb9fc64acc806cccc3f872431ca52 100644 (file)
--- a/ucm/HDAudio-Gigabyte-ALC1220DualCodecs/HDAudio-Gigabyte-ALC1220DualCodecs.conf
+++ b/ucm2/HDAudio-Gigabyte-ALC1220DualCodecs/HDAudio-Gigabyte-ALC1220DualCodecs.conf
@@ -1,3 +1,4 @@
+Syntax 2
 Comment "Gigabyte mobo with dual HD-audio codecs"
 SectionUseCase."HiFi" {
        File "HiFi.conf"

diff --git a/ucm/HDAudio-Gigabyte-ALC1220DualCodecs/HiFi.conf b/ucm2/HDAudio-Gigabyte-ALC1220DualCodecs/HiFi.conf
similarity index 88%
rename from ucm/HDAudio-Gigabyte-ALC1220DualCodecs/HiFi.conf
rename to ucm2/HDAudio-Gigabyte-ALC1220DualCodecs/HiFi.conf
index 509678964f3f695e9fc23befd4847d93fba4e739..e4347b5db41be64178ee1735926e0293b6666232 100644 (file)
--- a/ucm/HDAudio-Gigabyte-ALC1220DualCodecs/HiFi.conf
+++ b/ucm2/HDAudio-Gigabyte-ALC1220DualCodecs/HiFi.conf
@@ -4,7 +4,6 @@ SectionVerb {
        }
 
        EnableSequence [
-               cdev "hw:PCH"
                cset "name='Front Playback Volume' 100%"
                cset "name='Front Playback Switch' on"
                cset "name='Rear-Panel Capture Volume' 100%"
@@ -12,7 +11,6 @@ SectionVerb {
        ]
 
        DisableSequence [
-               cdev "hw:PCH"
                cset "name='Front Playback Volume' 0"
                cset "name='Front Playback Switch' off"
                cset "name='Rear-Panel Capture Volume' 0"
@@ -33,13 +31,11 @@ SectionDevice."Speaker" {
        ]
 
        EnableSequence [
-               cdev "hw:PCH"
                cset "name='Speaker Playback Switch' on"
                cset "name='Speaker Playback Volume' 100%"
        ]
 
        DisableSequence [
-               cdev "hw:PCH"
                cset "name='Speaker Playback Volume' 0"
                cset "name='Speaker Playback Switch' off"
        ]
@@ -50,7 +46,7 @@ SectionDevice."LineOut" {
 
        Value {
                PlaybackChannels "2"
-               PlaybackPCM "hw:PCH,0"
+               PlaybackPCM "hw:${CardId},0"
                JackControl "Line Out Jack"
                JackHWMute "Speaker"
        }
@@ -61,7 +57,7 @@ SectionDevice."Headphone" {
 
        Value {
                PlaybackChannels "2"
-               PlaybackPCM "hw:PCH,4"
+               PlaybackPCM "hw:${CardId},4"
                JackControl "Front Headphone Jack"
                JackHWMute "Speaker"
        }
@@ -71,13 +67,11 @@ SectionDevice."Headphone" {
        ]
 
        EnableSequence [
-               cdev "hw:PCH"
                cset "name='Headphone Playback Switch' on"
                cset "name='Headphone Playback Volume' 100%"
        ]
 
        DisableSequence [
-               cdev "hw:PCH"
                cset "name='Headphone Playback Volume' 0"
                cset "name='Headphone Playback Switch' off"
        ]
@@ -88,7 +82,7 @@ SectionDevice."LineIn" {
 
        Value {
                CaptureChannels "2"
-               CapturePCM "hw:PCH,0"
+               CapturePCM "hw:${CardId},0"
                JackControl "Line Jack"
        }
 
@@ -97,7 +91,6 @@ SectionDevice."LineIn" {
        ]
 
        EnableSequence [
-               cdev "hw:PCH"
                cset "name='Input Source' Line"
        ]
 }
@@ -107,7 +100,7 @@ SectionDevice."RearMic" {
 
        Value {
                CaptureChannels "2"
-               CapturePCM "hw:PCH,0"
+               CapturePCM "hw:${CardId},0"
                # CapturePriority "150"
                JackHWMute "LineIn"
        }
@@ -117,7 +110,6 @@ SectionDevice."RearMic" {
        ]
 
        EnableSequence [
-               cdev "hw:PCH"
                cset "name='Input Source' Rear Mic"
        ]
 }
@@ -127,18 +119,16 @@ SectionDevice."FrontMic" {
 
        Value {
                CaptureChannels "2"
-               CapturePCM "hw:PCH,4"
+               CapturePCM "hw:${CardId},4"
                JackControl "Front Mic Jack"
        }
 
        EnableSequence [
-               cdev "hw:PCH"
                cset "name='Front-Panel Capture Volume' 100%"
                cset "name='Front-Panel Capture Switch' on"
        ]
 
        DisableSequence [
-               cdev "hw:PCH"
                cset "name='Front-Panel Capture Volume' 0"
                cset "name='Front-Panel Capture Switch' off"
        ]