HDAudio-Lenovo-DualCodecs: adapt to ucm2

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

diff --git a/ucm/HDAudio-Lenovo-DualCodecs/HDAudio-Lenovo-DualCodecs.conf b/ucm2/HDAudio-Lenovo-DualCodecs/HDAudio-Lenovo-DualCodecs.conf
similarity index 92%
rename from ucm/HDAudio-Lenovo-DualCodecs/HDAudio-Lenovo-DualCodecs.conf
rename to ucm2/HDAudio-Lenovo-DualCodecs/HDAudio-Lenovo-DualCodecs.conf
index 98fdd8cceb7b1627ed0bc99905f9de97fc8294cd..f5c1ef112270adda39984e980974b5a41a346591 100644 (file)
--- a/ucm/HDAudio-Lenovo-DualCodecs/HDAudio-Lenovo-DualCodecs.conf
+++ b/ucm2/HDAudio-Lenovo-DualCodecs/HDAudio-Lenovo-DualCodecs.conf
@@ -1,3 +1,4 @@
+Syntax 2
 Comment "Lenovo laptop with dual HD-audio codecs"
 SectionUseCase."HiFi" {
        File "HiFi.conf"

diff --git a/ucm/HDAudio-Lenovo-DualCodecs/HiFi.conf b/ucm2/HDAudio-Lenovo-DualCodecs/HiFi.conf
similarity index 87%
rename from ucm/HDAudio-Lenovo-DualCodecs/HiFi.conf
rename to ucm2/HDAudio-Lenovo-DualCodecs/HiFi.conf
index ece780da146df387bde00efa2b6e139b56b91a7e..364f9a6ab85b915dce560e75d05c4c5bb7428aef 100644 (file)
--- a/ucm/HDAudio-Lenovo-DualCodecs/HiFi.conf
+++ b/ucm2/HDAudio-Lenovo-DualCodecs/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"
@@ -25,7 +23,7 @@ SectionDevice."Speaker" {
 
        Value {
                PlaybackChannels "2"
-               PlaybackPCM "hw:PCH,4"
+               PlaybackPCM "hw:${CardId},4"
        }
 
        ConflictingDevice [
@@ -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"
                cset "name='Line Boost Volume' 3"
        ]
@@ -108,7 +101,7 @@ SectionDevice."RearMic" {
 
        Value {
                CaptureChannels "2"
-               CapturePCM "hw:PCH,0"
+               CapturePCM "hw:${CardId},0"
                # CapturePriority "150"
                JackHWMute "LineIn"
        }
@@ -118,7 +111,6 @@ SectionDevice."RearMic" {
        ]
 
        EnableSequence [
-               cdev "hw:PCH"
                cset "name='Input Source' Rear Mic"
        ]
 }
@@ -128,18 +120,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"
        ]