USB-Audio: update to use new DirectUseCase macro

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2026-01-06 15:22:02 +01:00
commit 57ec009f59
33 changed files with 92 additions and 113 deletions

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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
#}

View file

@ -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}" }

View file

@ -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}" }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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}" }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }

View file

@ -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 }