From f424bf6a7b5d5748909e90428293e6cc02eae082 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 21 Nov 2019 08:20:37 +0100 Subject: [PATCH] ucm2: move HDAudio-*DualCodecs configs to the right card name directory Signed-off-by: Jaroslav Kysela --- ucm2/HDA Intel PCH/HDAudio-DualCodecs.conf | 6 + .../HDAudio-Gigabyte-ALC1220DualCodecs.conf | 1 + .../HDAudio-Lenovo-DualCodecs.conf | 1 + .../HiFi-dual.conf} | 10 +- .../HDAudio-Gigabyte-ALC1220DualCodecs.conf | 6 - .../HiFi.conf | 135 ------------------ .../HDAudio-Lenovo-DualCodecs.conf | 6 - 7 files changed, 17 insertions(+), 148 deletions(-) create mode 100644 ucm2/HDA Intel PCH/HDAudio-DualCodecs.conf create mode 120000 ucm2/HDA Intel PCH/HDAudio-Gigabyte-ALC1220DualCodecs.conf create mode 120000 ucm2/HDA Intel PCH/HDAudio-Lenovo-DualCodecs.conf rename ucm2/{HDAudio-Lenovo-DualCodecs/HiFi.conf => HDA Intel PCH/HiFi-dual.conf} (93%) delete mode 100644 ucm2/HDAudio-Gigabyte-ALC1220DualCodecs/HDAudio-Gigabyte-ALC1220DualCodecs.conf delete mode 100644 ucm2/HDAudio-Gigabyte-ALC1220DualCodecs/HiFi.conf delete mode 100644 ucm2/HDAudio-Lenovo-DualCodecs/HDAudio-Lenovo-DualCodecs.conf diff --git a/ucm2/HDA Intel PCH/HDAudio-DualCodecs.conf b/ucm2/HDA Intel PCH/HDAudio-DualCodecs.conf new file mode 100644 index 0000000..8aaabd0 --- /dev/null +++ b/ucm2/HDA Intel PCH/HDAudio-DualCodecs.conf @@ -0,0 +1,6 @@ +Syntax 2 +Comment "HDAudio with dual HD-audio codecs" +SectionUseCase."HiFi" { + File "HiFi-dual.conf" + Comment "Default" +} diff --git a/ucm2/HDA Intel PCH/HDAudio-Gigabyte-ALC1220DualCodecs.conf b/ucm2/HDA Intel PCH/HDAudio-Gigabyte-ALC1220DualCodecs.conf new file mode 120000 index 0000000..89801aa --- /dev/null +++ b/ucm2/HDA Intel PCH/HDAudio-Gigabyte-ALC1220DualCodecs.conf @@ -0,0 +1 @@ +HDAudio-DualCodecs.conf \ No newline at end of file diff --git a/ucm2/HDA Intel PCH/HDAudio-Lenovo-DualCodecs.conf b/ucm2/HDA Intel PCH/HDAudio-Lenovo-DualCodecs.conf new file mode 120000 index 0000000..89801aa --- /dev/null +++ b/ucm2/HDA Intel PCH/HDAudio-Lenovo-DualCodecs.conf @@ -0,0 +1 @@ +HDAudio-DualCodecs.conf \ No newline at end of file diff --git a/ucm2/HDAudio-Lenovo-DualCodecs/HiFi.conf b/ucm2/HDA Intel PCH/HiFi-dual.conf similarity index 93% rename from ucm2/HDAudio-Lenovo-DualCodecs/HiFi.conf rename to ucm2/HDA Intel PCH/HiFi-dual.conf index 364f9a6..47c1583 100644 --- a/ucm2/HDAudio-Lenovo-DualCodecs/HiFi.conf +++ b/ucm2/HDA Intel PCH/HiFi-dual.conf @@ -92,7 +92,15 @@ SectionDevice."LineIn" { EnableSequence [ cset "name='Input Source' Line" - cset "name='Line Boost Volume' 3" + If.0 { + Condition { + Type ControlExists + Control "name='Line Boost Volume'" + } + True { + cset "name='Line Boost Volume' 3" + } + } ] } diff --git a/ucm2/HDAudio-Gigabyte-ALC1220DualCodecs/HDAudio-Gigabyte-ALC1220DualCodecs.conf b/ucm2/HDAudio-Gigabyte-ALC1220DualCodecs/HDAudio-Gigabyte-ALC1220DualCodecs.conf deleted file mode 100644 index d406f8f..0000000 --- a/ucm2/HDAudio-Gigabyte-ALC1220DualCodecs/HDAudio-Gigabyte-ALC1220DualCodecs.conf +++ /dev/null @@ -1,6 +0,0 @@ -Syntax 2 -Comment "Gigabyte mobo with dual HD-audio codecs" -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Default" -} diff --git a/ucm2/HDAudio-Gigabyte-ALC1220DualCodecs/HiFi.conf b/ucm2/HDAudio-Gigabyte-ALC1220DualCodecs/HiFi.conf deleted file mode 100644 index e4347b5..0000000 --- a/ucm2/HDAudio-Gigabyte-ALC1220DualCodecs/HiFi.conf +++ /dev/null @@ -1,135 +0,0 @@ -SectionVerb { - Value { - TQ "HiFi" - } - - EnableSequence [ - cset "name='Front Playback Volume' 100%" - cset "name='Front Playback Switch' on" - cset "name='Rear-Panel Capture Volume' 100%" - cset "name='Rear-Panel Capture Switch' on" - ] - - DisableSequence [ - cset "name='Front Playback Volume' 0" - cset "name='Front Playback Switch' off" - cset "name='Rear-Panel Capture Volume' 0" - cset "name='Rear-Panel Capture Switch' off" - ] -} - -SectionDevice."Speaker" { - Comment "Speaker" - - Value { - PlaybackChannels "2" - PlaybackPCM "hw:PCH,4" - } - - 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" - ] -} - -SectionDevice."LineOut" { - Comment "Line Out" - - Value { - PlaybackChannels "2" - PlaybackPCM "hw:${CardId},0" - JackControl "Line Out Jack" - JackHWMute "Speaker" - } -} - -SectionDevice."Headphone" { - Comment "Headphone" - - Value { - PlaybackChannels "2" - PlaybackPCM "hw:${CardId},4" - JackControl "Front Headphone Jack" - JackHWMute "Speaker" - } - - 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" { - Comment "Rear Line In" - - Value { - CaptureChannels "2" - CapturePCM "hw:${CardId},0" - JackControl "Line Jack" - } - - ConflictingDevice [ - "RearMic" - ] - - EnableSequence [ - cset "name='Input Source' Line" - ] -} - -SectionDevice."RearMic" { - Comment "Rear Microphone" - - Value { - CaptureChannels "2" - CapturePCM "hw:${CardId},0" - # CapturePriority "150" - JackHWMute "LineIn" - } - - ConflictingDevice [ - "LineIn" - ] - - EnableSequence [ - cset "name='Input Source' Rear Mic" - ] -} - -SectionDevice."FrontMic" { - Comment "Front Microphone" - - Value { - CaptureChannels "2" - CapturePCM "hw:${CardId},4" - 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" - ] -} diff --git a/ucm2/HDAudio-Lenovo-DualCodecs/HDAudio-Lenovo-DualCodecs.conf b/ucm2/HDAudio-Lenovo-DualCodecs/HDAudio-Lenovo-DualCodecs.conf deleted file mode 100644 index f5c1ef1..0000000 --- a/ucm2/HDAudio-Lenovo-DualCodecs/HDAudio-Lenovo-DualCodecs.conf +++ /dev/null @@ -1,6 +0,0 @@ -Syntax 2 -Comment "Lenovo laptop with dual HD-audio codecs" -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Default" -} -- 2.47.1