HDA-Intel/HiFi-dual: fixes and corrections

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

diff --git a/ucm2/HDA Intel PCH/HDAudio-DualCodecs.conf b/ucm2/HDA-Intel/HDAudio-DualCodecs.conf
similarity index 100%
rename from ucm2/HDA Intel PCH/HDAudio-DualCodecs.conf
rename to ucm2/HDA-Intel/HDAudio-DualCodecs.conf

diff --git a/ucm2/HDA Intel PCH/HDAudio-Gigabyte-ALC1220DualCodecs.conf b/ucm2/HDA-Intel/HDAudio-Gigabyte-ALC1220DualCodecs.conf
similarity index 100%
rename from ucm2/HDA Intel PCH/HDAudio-Gigabyte-ALC1220DualCodecs.conf
rename to ucm2/HDA-Intel/HDAudio-Gigabyte-ALC1220DualCodecs.conf

diff --git a/ucm2/HDA Intel PCH/HDAudio-Lenovo-DualCodecs.conf b/ucm2/HDA-Intel/HDAudio-Lenovo-DualCodecs.conf
similarity index 100%
rename from ucm2/HDA Intel PCH/HDAudio-Lenovo-DualCodecs.conf
rename to ucm2/HDA-Intel/HDAudio-Lenovo-DualCodecs.conf

diff --git a/ucm2/HDA Intel PCH/HiFi-dual.conf b/ucm2/HDA-Intel/HiFi-dual.conf
similarity index 55%
rename from ucm2/HDA Intel PCH/HiFi-dual.conf
rename to ucm2/HDA-Intel/HiFi-dual.conf
index 63b3fe61edc00adc3b2555ca1ee64f91271912df..846c6db75a51fd7e3d58e826f1b1a61d9bac9407 100644 (file)
--- a/ucm2/HDA Intel PCH/HiFi-dual.conf
+++ b/ucm2/HDA-Intel/HiFi-dual.conf
@@ -1,6 +1,8 @@
 SectionVerb {
        Value {
                TQ "HiFi"
+               PlaybackChannels 2
+               CaptureChannels 2
        }
 
        EnableSequence [
@@ -22,31 +24,22 @@ SectionDevice."Speaker" {
        Comment "Speaker"
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 100
                PlaybackPCM "hw:${CardId},4"
+               PlaybackMixerElem "Speaker"
        }
 
        ConflictingDevice [
-               "Headphone"
-       ]
-
-       EnableSequence [
-               cset "name='Speaker Playback Switch' on"
-               cset "name='Speaker Playback Volume' 100%"
-       ]
-
-       DisableSequence [
-               cset "name='Speaker Playback Volume' 0"
-               cset "name='Speaker Playback Switch' off"
+               "Headphones"
        ]
 }
 
-SectionDevice."LineOut" {
+SectionDevice."Line1" {
        Comment "Line Out"
 
        Value {
-               PlaybackChannels "2"
-               PlaybackPCM "hw:${CardId},0"
+               PlaybackPriority 200
+               PlaybackPCM "hw:${CardId}"
                JackControl "Line Out Jack"
                JackHWMute "Speaker"
        }
@@ -56,8 +49,9 @@ SectionDevice."Headphones" {
        Comment "Headphones"
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 300
                PlaybackPCM "hw:${CardId},4"
+               PlaybackMixerElem "Headphone"
                JackControl "Front Headphone Jack"
                JackHWMute "Speaker"
        }
@@ -65,29 +59,19 @@ SectionDevice."Headphones" {
        ConflictingDevice [
                "Speaker"
        ]
-
-       EnableSequence [
-               cset "name='Headphone Playback Switch' on"
-               cset "name='Headphone Playback Volume' 100%"
-       ]
-
-       DisableSequence [
-               cset "name='Headphone Playback Volume' 0"
-               cset "name='Headphone Playback Switch' off"
-       ]
 }
 
-SectionDevice."LineIn" {
+SectionDevice."Line2" {
        Comment "Rear Line In"
 
        Value {
-               CaptureChannels "2"
-               CapturePCM "hw:${CardId},0"
+               CapturePriority 200
+               CapturePCM "hw:${CardId}"
                JackControl "Line Jack"
        }
 
        ConflictingDevice [
-               "RearMic"
+               "Mic2"
        ]
 
        EnableSequence [
@@ -104,18 +88,17 @@ SectionDevice."LineIn" {
        ]
 }
 
-SectionDevice."RearMic" {
+SectionDevice."Mic2" {
        Comment "Rear Microphone"
 
        Value {
-               CaptureChannels "2"
-               CapturePCM "hw:${CardId},0"
-               # CapturePriority "150"
-               JackHWMute "LineIn"
+               CapturePriority 300
+               CapturePCM "hw:${CardId}"
+               JackHWMute "Line2"
        }
 
        ConflictingDevice [
-               "LineIn"
+               "Line2"
        ]
 
        EnableSequence [
@@ -123,22 +106,13 @@ SectionDevice."RearMic" {
        ]
 }
 
-SectionDevice."FrontMic" {
+SectionDevice."Mic1" {
        Comment "Front Microphone"
 
        Value {
-               CaptureChannels "2"
+               CapturePriority 100
                CapturePCM "hw:${CardId},4"
+               CaptureMixerElem "Front-Panel"
                JackControl "Front Mic Jack"
        }
-
-       EnableSequence [
-               cset "name='Front-Panel Capture Volume' 100%"
-               cset "name='Front-Panel Capture Switch' on"
-       ]
-
-       DisableSequence [
-               cset "name='Front-Panel Capture Volume' 0"
-               cset "name='Front-Panel Capture Switch' off"
-       ]
 }