Takashi Iwai
cea7e1aaaa
- Backport upstream fixes: AMD MCP mute issue, chtnau8824 fixes, rt715 fix, and soundwire initialization fix: 0004-Revert-ucm2-HDA-acp-add-Capture-simple-mixer-element.patch 0005-chtnau8824-Fix-mono-speaker-config-not-working.patch 0006-chtnau8824-Add-support-for-laptops-using-stereo-DMIC.patch 0007-chtnau8824-Boost-analog-mic-volumes-a-bit.patch 0008-rt715-init-setup-ADC07-to-a-proper-volume.patch 0009-sof-hda-dsp-Set-Master-Playback-Switch-on-in-the-Boo.patch OBS-URL: https://build.opensuse.org/request/show/855782 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-ucm-conf?expand=0&rev=25
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From 13420f94a6858e9c3e3a056a7987d9c0db823394 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Sun, 6 Dec 2020 13:47:16 +0100
|
|
Subject: [PATCH 5/9] chtnau8824: Fix mono speaker config not working
|
|
|
|
Fix the Speaker define / var being changed from "Speaker" to "MonoSpeaker"
|
|
not having any effect because the variable gets expanded before the if
|
|
making the change is interpreted.
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
ucm2/chtnau8824/HiFi.conf | 15 +++++++++++----
|
|
1 file changed, 11 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/ucm2/chtnau8824/HiFi.conf b/ucm2/chtnau8824/HiFi.conf
|
|
index 3ccd6b149517..d7a5f63f9774 100644
|
|
--- a/ucm2/chtnau8824/HiFi.conf
|
|
+++ b/ucm2/chtnau8824/HiFi.conf
|
|
@@ -34,8 +34,15 @@ SectionVerb {
|
|
}
|
|
}
|
|
|
|
-Include.spk.File "/codecs/nau8824/${var:Speaker}.conf"
|
|
-Include.hp.File "/codecs/nau8824/HeadPhones.conf"
|
|
+# The includes using $vars in there path must be conditional otherwise the
|
|
+# $var gets expanded before the other If-s above can change the vars.
|
|
+If.cfg-includes {
|
|
+ Condition { Type String Empty "" }
|
|
+ True {
|
|
+ Include.spk.File "/codecs/nau8824/${var:Speaker}.conf"
|
|
+ Include.hp.File "/codecs/nau8824/HeadPhones.conf"
|
|
|
|
-Include.mic.File "/codecs/nau8824/InternalMic.conf"
|
|
-Include.hsmic.File "/codecs/nau8824/HeadsetMic.conf"
|
|
+ Include.mic.File "/codecs/nau8824/InternalMic.conf"
|
|
+ Include.hsmic.File "/codecs/nau8824/HeadsetMic.conf"
|
|
+ }
|
|
+}
|
|
--
|
|
2.26.2
|
|
|