ucm2: direct profile - allow to override the card name

Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/160
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/USB-Audio/Behringer/Flow8-Recording.conf b/ucm2/USB-Audio/Behringer/Flow8-Recording.conf
index 0786d2f91eaf25f82fb1d55e4f67f6a015dc793e..173901ac29d826af9a46ebe4510f4378ab483794 100644 (file)
--- a/ucm2/USB-Audio/Behringer/Flow8-Recording.conf
+++ b/ucm2/USB-Audio/Behringer/Flow8-Recording.conf
@@ -5,6 +5,7 @@ SectionUseCase."Recording" {
        File "/USB-Audio/Behringer/Flow8-Recording-Hifi.conf"
 }
 
+Define.DirectCardName "Flow8 Recording"
 Define.DirectPlaybackChannels 4
 Define.DirectCaptureChannels 10
 

diff --git a/ucm2/USB-Audio/Behringer/Flow8-Streaming.conf b/ucm2/USB-Audio/Behringer/Flow8-Streaming.conf
index 6a1f4cc54d85cceb4f8ea8ca84697fc6b0b02944..d8152f8ed3f735d9c286db65719d32d986fad020 100644 (file)
--- a/ucm2/USB-Audio/Behringer/Flow8-Streaming.conf
+++ b/ucm2/USB-Audio/Behringer/Flow8-Streaming.conf
@@ -5,6 +5,7 @@ SectionUseCase."Streaming" {
        File "/USB-Audio/Behringer/Flow8-Streaming-Hifi.conf"
 }
 
+Define.DirectCardName "Flow8 Streaming"
 Define.DirectPlaybackChannels 4
 Define.DirectCaptureChannels 2
 

diff --git a/ucm2/common/direct.conf b/ucm2/common/direct.conf
index ec705209b7b6d29aeec8bcc6309885fb29d25cff..f69cbc9016aeb1589413e77f03d8a83a59a1c6c1 100644 (file)
--- a/ucm2/common/direct.conf
+++ b/ucm2/common/direct.conf
@@ -1,4 +1,12 @@
+If.direct {
+       Condition {
+               Type String
+               Empty "${var:DirectCardName}"
+       }
+       True.Define.DirectCardName "${CardName}"
+}
+
 SectionUseCase."Direct" {
-       Comment "Direct ${CardName}"
+       Comment "Direct ${var:DirectCardName}"
        File "/common/direct-verb.conf"
 }