From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 13 May 2021 15:04:30 +0000 (+0200)
Subject: ucm2: replace ${CardIdByName} substitution with ${find-card}
X-Git-Tag: v1.2.5~27
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=ec85b3e0d7fbe4c334a494f5201de92d10cff275;p=alsa-ucm-conf.git

ucm2: replace ${CardIdByName} substitution with ${find-card}

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

diff --git a/ucm2/HDA-Intel/HDA-Intel.conf b/ucm2/HDA-Intel/HDA-Intel.conf
index dea99cf..5794e72 100644
--- a/ucm2/HDA-Intel/HDA-Intel.conf
+++ b/ucm2/HDA-Intel/HDA-Intel.conf
@@ -2,7 +2,7 @@ Syntax 3
 
 Define.Use ""	# a non-empty string to use UCM configuration for HDA devices
 
-Define.AcpCardId "$${CardIdByName:acp}"
+Define.AcpCardId "$${find-card:field=name,return=id,regex='^acp$'}"
 
 If.acp {
 	Condition {
diff --git a/ucm2/USB-Audio/Gigabyte-Aorus-Master-Main-Audio-HiFi.conf b/ucm2/USB-Audio/Gigabyte-Aorus-Master-Main-Audio-HiFi.conf
index 37800fb..593787c 100644
--- a/ucm2/USB-Audio/Gigabyte-Aorus-Master-Main-Audio-HiFi.conf
+++ b/ucm2/USB-Audio/Gigabyte-Aorus-Master-Main-Audio-HiFi.conf
@@ -1,4 +1,4 @@
-Define.SecondaryCardId "$${CardIdByName:Aorus Master Front Headphone}"
+Define.SecondaryCardId "$${find-card:field=name,return=id,regex='Aorus Master Front Headphone'"
 
 SectionDevice."Speaker" {
 	Comment "Speakers"