USB-Audio: update to use new DirectUseCase macro

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

diff --git a/ucm2/USB-Audio/AllenAndHeath/Zedi10.conf b/ucm2/USB-Audio/AllenAndHeath/Zedi10.conf
index 00d227360b8787fa9dcbdf839693d4e2825233af..52b6c1b51b27b3d3c8129f24df870dfed49b5dea 100644 (file)
--- a/ucm2/USB-Audio/AllenAndHeath/Zedi10.conf
+++ b/ucm2/USB-Audio/AllenAndHeath/Zedi10.conf
@@ -5,8 +5,6 @@ SectionUseCase."Recording" {
        File "/USB-Audio/AllenAndHeath/Zedi10-Hifi.conf"
 }
 
-Define.DirectCardName "Zedi10"
-Define.DirectPlaybackChannels 4
-Define.DirectCaptureChannels 4
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" CardName="Zedi10" PlaybackChannels=4 CaptureChannels=4 }

diff --git a/ucm2/USB-Audio/Arturia/Minifuse-12.conf b/ucm2/USB-Audio/Arturia/Minifuse-12.conf
index 627ffa95261b6b082e5b69f7117a39c4da0f01d1..eaca337c5b5b4075379fffa64dd05d6d1e39fe16 100644 (file)
--- a/ucm2/USB-Audio/Arturia/Minifuse-12.conf
+++ b/ucm2/USB-Audio/Arturia/Minifuse-12.conf
@@ -5,7 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/Arturia/Minifuse-12-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 4
-Define.DirectCaptureChannels 4
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=4 CaptureChannels=4 }

diff --git a/ucm2/USB-Audio/Arturia/Minifuse-4.conf b/ucm2/USB-Audio/Arturia/Minifuse-4.conf
index fc5a1da15690453ff2a584aae634f786a4f6575c..f529b206e98c61621a01cedcc9396fd8c6c2da02 100644 (file)
--- a/ucm2/USB-Audio/Arturia/Minifuse-4.conf
+++ b/ucm2/USB-Audio/Arturia/Minifuse-4.conf
@@ -5,7 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/Arturia/Minifuse-4-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 6
-Define.DirectCaptureChannels 6
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=6 CaptureChannels=6 }

diff --git a/ucm2/USB-Audio/Audient/Audient-iD14-0008.conf b/ucm2/USB-Audio/Audient/Audient-iD14-0008.conf
index ca2bb48ddf1ca7b75389cf45b04ac4a8881448ac..c3e1229aa29d7e4d80ebf70d36f10240e0c5d7a4 100644 (file)
--- a/ucm2/USB-Audio/Audient/Audient-iD14-0008.conf
+++ b/ucm2/USB-Audio/Audient/Audient-iD14-0008.conf
@@ -5,7 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/Audient/Audient-iD14-HiFi-0008.conf"
 }
 
-Define.DirectPlaybackChannels 6
-Define.DirectCaptureChannels 12
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=6 CaptureChannels=12 }

diff --git a/ucm2/USB-Audio/Audient/Audient-iD4-0003.conf b/ucm2/USB-Audio/Audient/Audient-iD4-0003.conf
index 82dcac3bf539d876fd6871316f4058d5a8eab05d..1bd0807440c4c9f45432b1cd08b4b628ea7313bd 100644 (file)
--- a/ucm2/USB-Audio/Audient/Audient-iD4-0003.conf
+++ b/ucm2/USB-Audio/Audient/Audient-iD4-0003.conf
@@ -5,7 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/Audient/Audient-iD4-HiFi-0003.conf"
 }
 
-Define.DirectPlaybackChannels 2
-Define.DirectCaptureChannels 2
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=2 CaptureChannels=2 }

diff --git a/ucm2/USB-Audio/Audient/Audient-iD4-0009.conf b/ucm2/USB-Audio/Audient/Audient-iD4-0009.conf
index ebaf5418c9ce60cb8e36c07548c415d9f2335784..baf997b2c308992bf9f0a284c360c5a1ec36f5c0 100644 (file)
--- a/ucm2/USB-Audio/Audient/Audient-iD4-0009.conf
+++ b/ucm2/USB-Audio/Audient/Audient-iD4-0009.conf
@@ -5,7 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/Audient/Audient-iD4-HiFi-0009.conf"
 }
 
-Define.DirectPlaybackChannels 4
-Define.DirectCaptureChannels 4
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=4 CaptureChannels=4 }

diff --git a/ucm2/USB-Audio/Beacn/Beacn-Mic.conf b/ucm2/USB-Audio/Beacn/Beacn-Mic.conf
index 95c6f81682b92840c36cbef627c42f0835266f1b..530b47431a057a930dd2ee33fd24f7c34dc9797e 100644 (file)
--- a/ucm2/USB-Audio/Beacn/Beacn-Mic.conf
+++ b/ucm2/USB-Audio/Beacn/Beacn-Mic.conf
@@ -5,7 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/Beacn/Beacn-Mic-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 3
-Define.DirectCaptureChannels 4
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=3 CaptureChannels=4 }

diff --git a/ucm2/USB-Audio/Behringer/Flow8-Recording.conf b/ucm2/USB-Audio/Behringer/Flow8-Recording.conf
index 173901ac29d826af9a46ebe4510f4378ab483794..508d18c4246cf07f653c4aa312a0fc826aa12ad9 100644 (file)
--- a/ucm2/USB-Audio/Behringer/Flow8-Recording.conf
+++ b/ucm2/USB-Audio/Behringer/Flow8-Recording.conf
@@ -5,8 +5,6 @@ SectionUseCase."Recording" {
        File "/USB-Audio/Behringer/Flow8-Recording-Hifi.conf"
 }
 
-Define.DirectCardName "Flow8 Recording"
-Define.DirectPlaybackChannels 4
-Define.DirectCaptureChannels 10
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" CardName="Flow8 Recording" PlaybackChannels=4 CaptureChannels=10 }

diff --git a/ucm2/USB-Audio/Behringer/Flow8-Streaming.conf b/ucm2/USB-Audio/Behringer/Flow8-Streaming.conf
index d8152f8ed3f735d9c286db65719d32d986fad020..a2049e8ff7cd918f9e6337db06530f9ecf95a7da 100644 (file)
--- a/ucm2/USB-Audio/Behringer/Flow8-Streaming.conf
+++ b/ucm2/USB-Audio/Behringer/Flow8-Streaming.conf
@@ -5,8 +5,6 @@ SectionUseCase."Streaming" {
        File "/USB-Audio/Behringer/Flow8-Streaming-Hifi.conf"
 }
 
-Define.DirectCardName "Flow8 Streaming"
-Define.DirectPlaybackChannels 4
-Define.DirectCaptureChannels 2
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" CardName="Flow8 Streaming" PlaybackChannels=4 CaptureChannels=2 }

diff --git a/ucm2/USB-Audio/Behringer/UMC202HD.conf b/ucm2/USB-Audio/Behringer/UMC202HD.conf
index 5f5e5f5068b665ee8ecc153b3e5715cce9a2df3e..ba4af84643618daa87a50b29a01c6fb89967b664 100644 (file)
--- a/ucm2/USB-Audio/Behringer/UMC202HD.conf
+++ b/ucm2/USB-Audio/Behringer/UMC202HD.conf
@@ -5,7 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/Behringer/UMC202HD-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 2
-Define.DirectCaptureChannels 2
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=2 CaptureChannels=2 }

diff --git a/ucm2/USB-Audio/Behringer/UMC204HD.conf b/ucm2/USB-Audio/Behringer/UMC204HD.conf
index 2ce9b3b6b7a63ccf7bbef519b671d9dc00fabaf6..48978abb59e69cd528d173ab67cd9753c4975c64 100644 (file)
--- a/ucm2/USB-Audio/Behringer/UMC204HD.conf
+++ b/ucm2/USB-Audio/Behringer/UMC204HD.conf
@@ -5,7 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/Behringer/UMC204HD-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 4
-Define.DirectCaptureChannels 2
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=4 CaptureChannels=2 }

diff --git a/ucm2/USB-Audio/Behringer/UMC404HD.conf b/ucm2/USB-Audio/Behringer/UMC404HD.conf
index 91f231b445d511f2419875bce5cb68ff98c4c9f2..f04326a6d52bc22d55393304832e19502f1265ac 100644 (file)
--- a/ucm2/USB-Audio/Behringer/UMC404HD.conf
+++ b/ucm2/USB-Audio/Behringer/UMC404HD.conf
@@ -5,7 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/Behringer/UMC404HD-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 4
-Define.DirectCaptureChannels 4
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=4 CaptureChannels=4 }

diff --git a/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3.conf b/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3.conf
index d6e19f92e589171ae33912e8b411a66c800001f0..e8261fb7a8d0ff6c648d53806039c0fe6d5e911e 100644 (file)
--- a/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3.conf
+++ b/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3.conf
@@ -5,7 +5,6 @@ SectionUseCase."Mixer" {
        File "/USB-Audio/Digidesign/Digidesign-Mbox-3-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 4
-Define.DirectCaptureChannels 4
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=4 CaptureChannels=4 }

diff --git a/ucm2/USB-Audio/Focusrite/Scarlett-18i20.conf b/ucm2/USB-Audio/Focusrite/Scarlett-18i20.conf
index cbc581c5ccf570394949d443ed6a4b306ba35035..73429495e8cfd4bd105a156556fd2c8c1bcd685a 100644 (file)
--- a/ucm2/USB-Audio/Focusrite/Scarlett-18i20.conf
+++ b/ucm2/USB-Audio/Focusrite/Scarlett-18i20.conf
@@ -135,4 +135,29 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/Focusrite/Scarlett-18i20-HiFi.conf"
 }
 
-Include.dhw.File "/common/direct.conf"
+Include.dhw.File "/common/directm.conf"
+
+Macro.0.DirectUseCase {
+       Id="Direct 48kHz"
+       PlaybackChannels="${var:DirectPlaybackChannels}"
+       PlaybackRate=48000
+       CaptureChannels="${var:DirectCaptureChannels}"
+       CaptureRate=48000
+}
+#
+# Uncomment when tested!
+#
+#Macro.1.DirectUseCase {
+#      Id="Direct 96kHz"
+#      PlaybackChannels=16
+#      PlaybackRate=96000
+#      CaptureChannels=16
+#      CaptureRate=96000
+#}
+#Macro.2.DirectUseCase {
+#      Id="Direct 192kHz"
+#      PlaybackChannels=10
+#      PlaybackRate=192000
+#      CaptureChannels=10
+#      CaptureRate=192000
+#}

diff --git a/ucm2/USB-Audio/Focusrite/Scarlett-2i.conf b/ucm2/USB-Audio/Focusrite/Scarlett-2i.conf
index a27c7f9110f2bf8966147bf7e3f46d47f9cabc60..5c560e7edf65b21d19978c6cfe877330e3eaf6e9 100644 (file)
--- a/ucm2/USB-Audio/Focusrite/Scarlett-2i.conf
+++ b/ucm2/USB-Audio/Focusrite/Scarlett-2i.conf
@@ -91,12 +91,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/Focusrite/${var:Profile}.conf"
 }
 
-If.dhw {
-       Condition { Type AlwaysTrue }
-       True.Define {
-               DirectPlaybackChannels "${var:PlaybackChannels}"
-               DirectCaptureChannels "${var:CaptureChannels}"
-       }
-}
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels="${var:PlaybackChannels}" CaptureChannels="${var:CaptureChannels}" }

diff --git a/ucm2/USB-Audio/GoXLR/GoXLR.conf b/ucm2/USB-Audio/GoXLR/GoXLR.conf
index 44e55a9a61aab1848edde6f2979fe545af64ef24..a2241be99868ec9543278da6ade92f68515adddb 100644 (file)
--- a/ucm2/USB-Audio/GoXLR/GoXLR.conf
+++ b/ucm2/USB-Audio/GoXLR/GoXLR.conf
@@ -35,12 +35,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/GoXLR/GoXLR-HiFi.conf"
 }
 
-If.direct {
-       Condition { Type AlwaysTrue }
-       True {
-               Define.DirectPlaybackChannels "${var:PlaybackChannels}"
-               Define.DirectCaptureChannels "${var:CaptureChannels}"
-       }
-}
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels="${var:PlaybackChannels}" CaptureChannels="${var:CaptureChannels}" }

diff --git a/ucm2/USB-Audio/MOTU/D828.conf b/ucm2/USB-Audio/MOTU/D828.conf
index ebeec39e1d6ca0e52802d4c66549625d94d01e91..685b21c63fad80b1937215cf09f91c063eba9ef0 100644 (file)
--- a/ucm2/USB-Audio/MOTU/D828.conf
+++ b/ucm2/USB-Audio/MOTU/D828.conf
@@ -5,7 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/MOTU/D828-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 32    #32 channels via physical outputs
-Define.DirectCaptureChannels 30     #28 channels via physical inputs + 2 internal loopback inputs
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=32 CaptureChannels=30 }

diff --git a/ucm2/USB-Audio/MOTU/M2.conf b/ucm2/USB-Audio/MOTU/M2.conf
index 9c4bc76eba9dbc9fbf22849323c643f4e44fce1a..9d9d5d1980ddcae3124c81e89acec762c31fc332 100644 (file)
--- a/ucm2/USB-Audio/MOTU/M2.conf
+++ b/ucm2/USB-Audio/MOTU/M2.conf
@@ -5,8 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/MOTU/M2-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 2
-Define.DirectCaptureChannels 2
-
-Include.dhw.File "/common/direct.conf"
+Include.dhw.File "/common/directm.conf"
 
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=2 CaptureChannels=2 }

diff --git a/ucm2/USB-Audio/MOTU/M4.conf b/ucm2/USB-Audio/MOTU/M4.conf
index f753ac6fd5f8991da2686a9a64672b685a29975e..1f161a62ca3ec9aaea09ac99676e61dd326c58d7 100644 (file)
--- a/ucm2/USB-Audio/MOTU/M4.conf
+++ b/ucm2/USB-Audio/MOTU/M4.conf
@@ -5,8 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/MOTU/M4-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 4
-Define.DirectCaptureChannels 4
-
-Include.dhw.File "/common/direct.conf"
+Include.dhw.File "/common/directm.conf"
 
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=4 CaptureChannels=4 }

diff --git a/ucm2/USB-Audio/MOTU/M6.conf b/ucm2/USB-Audio/MOTU/M6.conf
index df4719e9e13126eecd9c151a6c647b073bfe73b7..24de6cdbef1ef6c93f274db3315450bdf1e7523e 100644 (file)
--- a/ucm2/USB-Audio/MOTU/M6.conf
+++ b/ucm2/USB-Audio/MOTU/M6.conf
@@ -5,8 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/MOTU/M6-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 4
-Define.DirectCaptureChannels 6
-
-Include.dhw.File "/common/direct.conf"
+Include.dhw.File "/common/directm.conf"
 
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=4 CaptureChannels=6 }

diff --git a/ucm2/USB-Audio/MOTU/UltraLite-mk5.conf b/ucm2/USB-Audio/MOTU/UltraLite-mk5.conf
index 50a476b2860412910bd05b410787c0705ce0480a..6e5635ca3eed2b00ae844092108ac523d267e5fe 100644 (file)
--- a/ucm2/USB-Audio/MOTU/UltraLite-mk5.conf
+++ b/ucm2/USB-Audio/MOTU/UltraLite-mk5.conf
@@ -5,8 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/MOTU/UltraLite-mk5-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 22
-Define.DirectCaptureChannels 20
-
-Include.dhw.File "/common/direct.conf"
+Include.dhw.File "/common/directm.conf"
 
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=22 CaptureChannels=20 }

diff --git a/ucm2/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1.conf b/ucm2/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1.conf
index e88b4eafb54de55f9f9931b9d719193c7c70b54b..1f8015978888e75356a948ce8484aecc4228e4c7 100644 (file)
--- a/ucm2/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1.conf
+++ b/ucm2/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1.conf
@@ -5,7 +5,6 @@ SectionUseCase."Mixer" {
        File "/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1-Mixer.conf"
 }
 
-Define.DirectPlaybackChannels 2
-
-Include.dhw.File "/common/direct.conf"
+Include.dhw.File "/common/directm.conf"
 
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=2 }

diff --git a/ucm2/USB-Audio/Presonus/Revelator-IO-44.conf b/ucm2/USB-Audio/Presonus/Revelator-IO-44.conf
index 7e771ab9dd15ae7cff180ec9e2fbddd82d9d05c0..57191a3ee509b4cc3dab09c5fd26b0a090439b24 100644 (file)
--- a/ucm2/USB-Audio/Presonus/Revelator-IO-44.conf
+++ b/ucm2/USB-Audio/Presonus/Revelator-IO-44.conf
@@ -6,7 +6,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/Presonus/Revelator-IO-44-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 6
-Define.DirectCaptureChannels 8
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=6 CaptureChannels=8 }

diff --git a/ucm2/USB-Audio/RME/Fireface-UCX-II.conf b/ucm2/USB-Audio/RME/Fireface-UCX-II.conf
index d1c977a738392334968cbf4dc25991f7facd77c4..d2ae3765d941d1ba30f2dfbe3950c9495fc051c4 100644 (file)
--- a/ucm2/USB-Audio/RME/Fireface-UCX-II.conf
+++ b/ucm2/USB-Audio/RME/Fireface-UCX-II.conf
@@ -33,7 +33,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/RME/Fireface-UCX-II-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 20
-Define.DirectCaptureChannels 20
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=20 CaptureChannels=20 }

diff --git a/ucm2/USB-Audio/RME/Fireface-UCX.conf b/ucm2/USB-Audio/RME/Fireface-UCX.conf
index 8e0b2d1dda2ecf0a2ecdacdb1a25bcac95ed8edf..085f75924f02d082e73066ae448ef00f3f23e925 100644 (file)
--- a/ucm2/USB-Audio/RME/Fireface-UCX.conf
+++ b/ucm2/USB-Audio/RME/Fireface-UCX.conf
@@ -29,7 +29,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/RME/Fireface-UCX-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 18
-Define.DirectCaptureChannels 18
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=18 CaptureChannels=18 }

diff --git a/ucm2/USB-Audio/SolidStateLabs/SSL2.conf b/ucm2/USB-Audio/SolidStateLabs/SSL2.conf
index 3cdb60b95c195a65b8f822a51b8b89970f18a660..694b7186c6245c340c7dfd996f2cf758eed02571 100644 (file)
--- a/ucm2/USB-Audio/SolidStateLabs/SSL2.conf
+++ b/ucm2/USB-Audio/SolidStateLabs/SSL2.conf
@@ -5,7 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/SolidStateLabs/SSL2-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 2
-Define.DirectCaptureChannels 4
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=2 CaptureChannels=4 }

diff --git a/ucm2/USB-Audio/SolidStateLabs/SSL2Plus.conf b/ucm2/USB-Audio/SolidStateLabs/SSL2Plus.conf
index c886593b7739a14aafd62f6b168f179dc93fb362..c15bdef6158b895d18ad70ec9fdaac0cc105dfcc 100644 (file)
--- a/ucm2/USB-Audio/SolidStateLabs/SSL2Plus.conf
+++ b/ucm2/USB-Audio/SolidStateLabs/SSL2Plus.conf
@@ -5,7 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/SolidStateLabs/SSL2Plus-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 4
-Define.DirectCaptureChannels 4
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=4 CaptureChannels=4 }

diff --git a/ucm2/USB-Audio/Steinberg/UR22C.conf b/ucm2/USB-Audio/Steinberg/UR22C.conf
index 154b50975174ad41ab3c345c34bbb46a7b37aa03..f8e8b09154c5c9ad7a2c42f234c65a4393eb6889 100644 (file)
--- a/ucm2/USB-Audio/Steinberg/UR22C.conf
+++ b/ucm2/USB-Audio/Steinberg/UR22C.conf
@@ -17,4 +17,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/Steinberg/UR22C-HiFi.conf"
 }
 
-Include.dhw.File "/common/direct.conf"
+Include.dhw.File "/common/directm.conf"
+
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels="${var:DirectPlaybackChannels}" CaptureChannels="${var:DirectCaptureChannels}" }

diff --git a/ucm2/USB-Audio/Steinberg/UR22mkII.conf b/ucm2/USB-Audio/Steinberg/UR22mkII.conf
index 0e798cb38e9ef0dd878d93f6ad84107904499f81..79f131db5d2d145f2134dae46071adf23d2c1930 100644 (file)
--- a/ucm2/USB-Audio/Steinberg/UR22mkII.conf
+++ b/ucm2/USB-Audio/Steinberg/UR22mkII.conf
@@ -5,7 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/Steinberg/UR22mkII-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 2
-Define.DirectCaptureChannels 2
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=2 CaptureChannels=2 }

diff --git a/ucm2/USB-Audio/Steinberg/UR24C.conf b/ucm2/USB-Audio/Steinberg/UR24C.conf
index 29be27c0dfbf250550a7c45e82be4ef982d3f900..81be656e350be43736b0d5e9f9a041586700b976 100644 (file)
--- a/ucm2/USB-Audio/Steinberg/UR24C.conf
+++ b/ucm2/USB-Audio/Steinberg/UR24C.conf
@@ -5,7 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/Steinberg/UR24C-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 4
-Define.DirectCaptureChannels 2
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=4 CaptureChannels=2 }

diff --git a/ucm2/USB-Audio/Steinberg/UR44.conf b/ucm2/USB-Audio/Steinberg/UR44.conf
index 7fde566a46270e833c17767de553a577be38486f..7d1e40892b31a15a7818481ad10c1c1a3513b1e3 100644 (file)
--- a/ucm2/USB-Audio/Steinberg/UR44.conf
+++ b/ucm2/USB-Audio/Steinberg/UR44.conf
@@ -5,7 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/Steinberg/UR44-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 4
-Define.DirectCaptureChannels 6
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=4 CaptureChannels=6 }

diff --git a/ucm2/USB-Audio/TASCAM/Model12.conf b/ucm2/USB-Audio/TASCAM/Model12.conf
index 2d8dd50f713a48f59223d4fcdb4896670bf08e03..f8092157b64dbf90b6b52c665c8707e56090d171 100755 (executable)
--- a/ucm2/USB-Audio/TASCAM/Model12.conf
+++ b/ucm2/USB-Audio/TASCAM/Model12.conf
@@ -5,7 +5,6 @@ SectionUseCase."HiFi" {
        File "/USB-Audio/TASCAM/Model12-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 10
-Define.DirectCaptureChannels 12
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=10 CaptureChannels=12 }

diff --git a/ucm2/USB-Audio/UniversalAudio/Volt2.conf b/ucm2/USB-Audio/UniversalAudio/Volt2.conf
index 7e4a898221a16cdd832419f07d7499a68453ace3..9a4c03e193cd090b54222e3ab31e9ad82c987414 100644 (file)
--- a/ucm2/USB-Audio/UniversalAudio/Volt2.conf
+++ b/ucm2/USB-Audio/UniversalAudio/Volt2.conf
@@ -1,11 +1,10 @@
-Comment "Universal Audio Volt 2"
+omment "Universal Audio Volt 2"
 
 SectionUseCase."HiFi" {
        Comment "Default"
        File "/USB-Audio/UniversalAudio/Volt2-HiFi.conf"
 }
 
-Define.DirectPlaybackChannels 2
-Define.DirectCaptureChannels 2
+Include.dhw.File "/common/directm.conf"
 
-Include.dhw.File "/common/direct.conf"
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=2 CaptureChannels=2 }