USB-Audio: Add support for UR24C firmware version channel differences

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/684
Signed-off-by: jwlademann <james.lademann@landregistry.gov.uk>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/USB-Audio/Steinberg/UR24C-HiFi.conf b/ucm2/USB-Audio/Steinberg/UR24C-HiFi.conf
index 285b5c4108928c009d7ff4deb6b2e3f33629d099..abd13c802483185e981525b7f33cc6ebf5ed6ee2 100644 (file)
--- a/ucm2/USB-Audio/Steinberg/UR24C-HiFi.conf
+++ b/ucm2/USB-Audio/Steinberg/UR24C-HiFi.conf
@@ -18,7 +18,7 @@ Macro [
                        Name "steinberg_ur24c_mono_in"
                        Direction Capture
                        Channels 1
-                       HWChannels 2
+                       HWChannels "${var:DirectCaptureChannels}"
                        HWChannelPos0 MONO
                        HWChannelPos1 MONO
                }
@@ -70,7 +70,7 @@ SectionDevice."Line 3" {
        Macro.pcm_split.SplitPCMDevice {
                Name "steinberg_ur24c_mono_in"
                Direction Capture
-               HWChannels 2
+               HWChannels "${var:DirectCaptureChannels}"
                Channels 1
                Channel0 0
                ChannelPos0 MONO
@@ -86,7 +86,7 @@ SectionDevice."Line 4" {
        Macro.pcm_split.SplitPCMDevice {
                Name "steinberg_ur24c_mono_in"
                Direction Capture
-               HWChannels 2
+               HWChannels "${var:DirectCaptureChannels}"
                Channels 1
                Channel0 1
                ChannelPos0 MONO

diff --git a/ucm2/USB-Audio/Steinberg/UR24C.conf b/ucm2/USB-Audio/Steinberg/UR24C.conf
index 81be656e350be43736b0d5e9f9a041586700b976..becb69c9a86392eeff3173bee48ca4608ab98c13 100644 (file)
--- a/ucm2/USB-Audio/Steinberg/UR24C.conf
+++ b/ucm2/USB-Audio/Steinberg/UR24C.conf
@@ -1,5 +1,17 @@
 Comment "Steinberg UR24C USB-Audio"
 
+Define.DirectPlaybackChannels 4
+Define.DirectCaptureChannels 4
+
+If.fw {
+       Condition {
+               Type RegexMatch
+               String "${sys-card:device/../bcdDevice}"
+               Regex "0[12].."
+       }
+       True.Define.DirectCaptureChannels 2
+}
+
 SectionUseCase."HiFi" {
        Comment "HiFi"
        File "/USB-Audio/Steinberg/UR24C-HiFi.conf"
@@ -7,4 +19,4 @@ SectionUseCase."HiFi" {
 
 Include.dhw.File "/common/directm.conf"
 
-Macro.0.DirectUseCase { Id="Direct" PlaybackChannels=4 CaptureChannels=2 }
+Macro.0.DirectUseCase { Id="Direct" PlaybackChannels="${var:DirectPlaybackChannels}" CaptureChannels="${var:DirectCaptureChannels}" }