From: Kacper Michajłow Date: Sun, 28 Aug 2022 09:59:31 +0000 (+0200) Subject: ucm2: HDA - add support for Internal Mic X-Git-Tag: v1.2.8~29 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=869ef171d3e7d6c87c283c7fcf5dd6ce79a6da78;p=alsa-ucm-conf.git ucm2: HDA - add support for Internal Mic Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/207 Signed-off-by: Kacper Michajłow Signed-off-by: Jaroslav Kysela --- diff --git a/ucm2/HDA/HiFi-analog.conf b/ucm2/HDA/HiFi-analog.conf index 72834d1..3c96f5d 100644 --- a/ucm2/HDA/HiFi-analog.conf +++ b/ucm2/HDA/HiFi-analog.conf @@ -1,5 +1,7 @@ # Generic HDA devices for analog I/O +Define.FrontMicName "" +Define.FrontMicJack "" Define.DeviceFrontMic "" Define.LineDevice "" Define.hpvol "Headphone" @@ -7,12 +9,33 @@ Define.hpjack "Headphone Jack" Define.loctl "Line" Define.lovol "Line" -If.fmic { +If.imicname { + Condition { + Type ControlExists + Control "name='Internal Mic Boost Volume'" + } + True.Define { + FrontMicName "Internal" + } +} + +If.fmicname { Condition { Type ControlExists Control "name='Front Mic Playback Switch'" } - True { + True.Define { + FrontMicName "Front" + FrontMicJack "Front Mic Jack" + } +} + +If.fmic { + Condition { + Type String + Empty "${var:FrontMicName}" + } + False { If.mic2 { Condition { Type String @@ -213,7 +236,7 @@ If.frontmic { Empty "${var:DeviceFrontMic}" } False.SectionDevice."${var:DeviceFrontMic}" { - Comment "Front Stereo Microphone" + Comment "${var:FrontMicName} Stereo Microphone" ConflictingDevice [ "${var:DeviceMic}" @@ -222,8 +245,14 @@ If.frontmic { Value { CapturePriority 400 Include.value.File "/HDA/HDA-Capture-value.conf" - CaptureMasterElem "Front Mic Boost" - JackControl "Front Mic Jack" + CaptureMasterElem "${var:FrontMicName} Mic Boost" + } + If.jack { + Condition { + Type String + Empty "${var:FrontMicJack}" + } + False.Value.JackControl "${var:FrontMicJack}" } } }