From 57ec009f596f53451e4d62bc8ecbc1b0bfdf5b2e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 6 Jan 2026 15:22:02 +0100 Subject: [PATCH] USB-Audio: update to use new DirectUseCase macro Signed-off-by: Jaroslav Kysela --- ucm2/USB-Audio/AllenAndHeath/Zedi10.conf | 6 ++--- ucm2/USB-Audio/Arturia/Minifuse-12.conf | 5 ++-- ucm2/USB-Audio/Arturia/Minifuse-4.conf | 5 ++-- ucm2/USB-Audio/Audient/Audient-iD14-0008.conf | 5 ++-- ucm2/USB-Audio/Audient/Audient-iD4-0003.conf | 5 ++-- ucm2/USB-Audio/Audient/Audient-iD4-0009.conf | 5 ++-- ucm2/USB-Audio/Beacn/Beacn-Mic.conf | 5 ++-- ucm2/USB-Audio/Behringer/Flow8-Recording.conf | 6 ++--- ucm2/USB-Audio/Behringer/Flow8-Streaming.conf | 6 ++--- ucm2/USB-Audio/Behringer/UMC202HD.conf | 5 ++-- ucm2/USB-Audio/Behringer/UMC204HD.conf | 5 ++-- ucm2/USB-Audio/Behringer/UMC404HD.conf | 5 ++-- .../Digidesign/Digidesign-Mbox-3.conf | 5 ++-- ucm2/USB-Audio/Focusrite/Scarlett-18i20.conf | 27 ++++++++++++++++++- ucm2/USB-Audio/Focusrite/Scarlett-2i.conf | 10 ++----- ucm2/USB-Audio/GoXLR/GoXLR.conf | 10 ++----- ucm2/USB-Audio/MOTU/D828.conf | 5 ++-- ucm2/USB-Audio/MOTU/M2.conf | 6 ++--- ucm2/USB-Audio/MOTU/M4.conf | 6 ++--- ucm2/USB-Audio/MOTU/M6.conf | 6 ++--- ucm2/USB-Audio/MOTU/UltraLite-mk5.conf | 6 ++--- .../NativeInstruments/Traktor-Kontrol-Z1.conf | 5 ++-- ucm2/USB-Audio/Presonus/Revelator-IO-44.conf | 5 ++-- ucm2/USB-Audio/RME/Fireface-UCX-II.conf | 5 ++-- ucm2/USB-Audio/RME/Fireface-UCX.conf | 5 ++-- ucm2/USB-Audio/SolidStateLabs/SSL2.conf | 5 ++-- ucm2/USB-Audio/SolidStateLabs/SSL2Plus.conf | 5 ++-- ucm2/USB-Audio/Steinberg/UR22C.conf | 4 ++- ucm2/USB-Audio/Steinberg/UR22mkII.conf | 5 ++-- ucm2/USB-Audio/Steinberg/UR24C.conf | 5 ++-- ucm2/USB-Audio/Steinberg/UR44.conf | 5 ++-- ucm2/USB-Audio/TASCAM/Model12.conf | 5 ++-- ucm2/USB-Audio/UniversalAudio/Volt2.conf | 7 +++-- 33 files changed, 92 insertions(+), 113 deletions(-) diff --git a/ucm2/USB-Audio/AllenAndHeath/Zedi10.conf b/ucm2/USB-Audio/AllenAndHeath/Zedi10.conf index 00d2273..52b6c1b 100644 --- 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 627ffa9..eaca337 100644 --- 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 fc5a1da..f529b20 100644 --- 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 ca2bb48..c3e1229 100644 --- 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 82dcac3..1bd0807 100644 --- 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 ebaf541..baf997b 100644 --- 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 95c6f81..530b474 100644 --- 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 173901a..508d18c 100644 --- 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 d8152f8..a2049e8 100644 --- 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 5f5e5f5..ba4af84 100644 --- 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 2ce9b3b..48978ab 100644 --- 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 91f231b..f04326a 100644 --- 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 d6e19f9..e8261fb 100644 --- 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 cbc581c..7342949 100644 --- 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 a27c7f9..5c560e7 100644 --- 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 44e55a9..a2241be 100644 --- 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 ebeec39..685b21c 100644 --- 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 9c4bc76..9d9d5d1 100644 --- 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 f753ac6..1f161a6 100644 --- 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 df4719e..24de6cd 100644 --- 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 50a476b..6e5635c 100644 --- 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 e88b4ea..1f80159 100644 --- 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 7e771ab..57191a3 100644 --- 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 d1c977a..d2ae376 100644 --- 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 8e0b2d1..085f759 100644 --- 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 3cdb60b..694b718 100644 --- 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 c886593..c15bdef 100644 --- 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 154b509..f8e8b09 100644 --- 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 0e798cb..79f131d 100644 --- 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 29be27c..81be656 100644 --- 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 7fde566..7d1e408 100644 --- 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 2d8dd50..f809215 100755 --- 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 7e4a898..9a4c03e 100644 --- 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 } -- 2.47.3