From 48e876f08bd05941db7c1d70593d688bc2937746 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 18 Sep 2025 16:24:33 +0200
Subject: [PATCH] Behringer UCM204HD/404HD: Fix the macro evaluation for Syntax
 7+

The behaviour was slightly changed for the Macro arguments. The substitution
is executed more early before If block evaluation.

Closes: https://github.com/alsa-project/alsa-ucm-conf/issues/564
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 ucm2/USB-Audio/Behringer/UMC204HD-HiFi.conf | 59 ++++++++-------
 ucm2/USB-Audio/Behringer/UMC404HD-HiFi.conf | 83 +++++++++++----------
 2 files changed, 74 insertions(+), 68 deletions(-)

diff --git a/ucm2/USB-Audio/Behringer/UMC204HD-HiFi.conf b/ucm2/USB-Audio/Behringer/UMC204HD-HiFi.conf
index 19660d2..d38baa0 100644
--- a/ucm2/USB-Audio/Behringer/UMC204HD-HiFi.conf
+++ b/ucm2/USB-Audio/Behringer/UMC204HD-HiFi.conf
@@ -39,38 +39,41 @@ If.pcm_controls {
 
 Include.ctl_remap.File "/common/ctl/remap.conf"
 
-Macro [
-	{
-		CtlRemapStereoVolSw {
-			Dst "Line A Playback"
-			Src "${var:PCMCTLName}"
-			Index0 0
-			Index1 1
+If.macro {
+	Condition { Type AlwaysTrue }
+	True.Macro [
+		{
+			CtlRemapStereoVolSw {
+				Dst "Line A Playback"
+				Src "${var:PCMCTLName}"
+				Index0 0
+				Index1 1
+			}
 		}
-	}
-	{
-		CtlRemapStereoVolSw {
-			Dst "Line B Playback"
-			Src "${var:PCMCTLName}"
-			Index0 2
-			Index1 3
+		{
+			CtlRemapStereoVolSw {
+				Dst "Line B Playback"
+				Src "${var:PCMCTLName}"
+				Index0 2
+				Index1 3
+			}
 		}
-	}
-	{
-		CtlRemapMonoVolSw {
-			Dst "Input 1 Capture"
-			Src "Mic Capture"
-			Index 0
+		{
+			CtlRemapMonoVolSw {
+				Dst "Input 1 Capture"
+				Src "Mic Capture"
+				Index 0
+			}
 		}
-	}
-	{
-		CtlRemapMonoVolSw {
-			Dst "Input 2 Capture"
-			Src "Mic Capture"
-			Index 1
+		{
+			CtlRemapMonoVolSw {
+				Dst "Input 2 Capture"
+				Src "Mic Capture"
+				Index 1
+			}
 		}
-	}
-]
+	]
+}
 
 SectionDevice."Line1" {
 	Comment "Line A"
diff --git a/ucm2/USB-Audio/Behringer/UMC404HD-HiFi.conf b/ucm2/USB-Audio/Behringer/UMC404HD-HiFi.conf
index df45dca..e78a844 100644
--- a/ucm2/USB-Audio/Behringer/UMC404HD-HiFi.conf
+++ b/ucm2/USB-Audio/Behringer/UMC404HD-HiFi.conf
@@ -41,52 +41,55 @@ If.pcm_controls {
 
 Include.ctl_remap.File "/common/ctl/remap.conf"
 
-Macro [
-	{
-		CtlRemapStereoVolSw {
-			Dst "Line A Playback"
-			Src "${var:PCMCTLName}"
-			Index0 0
-			Index1 1
+If.macro {
+	Condition { Type AlwaysTrue }
+	True.Macro [
+		{
+			CtlRemapStereoVolSw {
+				Dst "Line A Playback"
+				Src "${var:PCMCTLName}"
+				Index0 0
+				Index1 1
+			}
 		}
-	}
-	{
-		CtlRemapStereoVolSw {
-			Dst "Line B Playback"
-			Src "${var:PCMCTLName}"
-			Index0 2
-			Index1 3
+		{
+			CtlRemapStereoVolSw {
+				Dst "Line B Playback"
+				Src "${var:PCMCTLName}"
+				Index0 2
+				Index1 3
+			}
 		}
-	}
-	{
-		CtlRemapMonoVolSw {
-			Dst "Input 1 Capture"
-			Src "Mic Capture"
-			Index 0
+		{
+			CtlRemapMonoVolSw {
+				Dst "Input 1 Capture"
+				Src "Mic Capture"
+				Index 0
+			}
 		}
-	}
-	{
-		CtlRemapMonoVolSw {
-			Dst "Input 2 Capture"
-			Src "Mic Capture"
-			Index 1
+		{
+			CtlRemapMonoVolSw {
+				Dst "Input 2 Capture"
+				Src "Mic Capture"
+				Index 1
+			}
 		}
-	}
-	{
-		CtlRemapMonoVolSw {
-			Dst "Input 3 Capture"
-			Src "Mic Capture"
-			Index 2
+		{
+			CtlRemapMonoVolSw {
+				Dst "Input 3 Capture"
+				Src "Mic Capture"
+				Index 2
+			}
 		}
-	}
-	{
-		CtlRemapMonoVolSw {
-			Dst "Input 4 Capture"
-			Src "Mic Capture"
-			Index 3
+		{
+			CtlRemapMonoVolSw {
+				Dst "Input 4 Capture"
+				Src "Mic Capture"
+				Index 3
+			}
 		}
-	}
-]
+	]
+}
 
 SectionDevice."Line1" {
 	Comment "Line A"
-- 
2.47.1