ucm: USB-Audio - Add support for Focusrite Scarlett 2i2 gen2

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

diff --git a/ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2-HiFi.conf b/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2-HiFi.conf
similarity index 65%
rename from ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2-HiFi.conf
rename to ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2-HiFi.conf
index 5ee5076eb8053cb4cca364356c3fc660fe1b95ea..ab69bc79a378c17fbd8a8e978f167dbbf94dc66c 100644 (file)
--- a/ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2-HiFi.conf
+++ b/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2-HiFi.conf
@@ -3,7 +3,7 @@ Include.pcm_split.File "/common/pcm/split.conf"
 Macro [
        {
                SplitPCM {
-                       Name "scarlett2i4_stereo_out"
+                       Name "scarlett2i_stereo_out"
                        Direction Playback
                        Format S32_LE
                        Channels 2
@@ -16,7 +16,7 @@ Macro [
        }
        {
                SplitPCM {
-                       Name "scarlett2i4_mono_in"
+                       Name "scarlett2i_mono_in"
                        Direction Capture
                        Format S32_LE
                        Channels 1
@@ -33,7 +33,7 @@ SectionDevice."Line1" {
                PlaybackPriority 200
        }
        Macro.pcm_split.SplitPCMDevice {
-               Name "scarlett2i4_stereo_out"
+               Name "scarlett2i_stereo_out"
                Direction Playback
                HWChannels 4
                Channels 2
@@ -44,21 +44,28 @@ SectionDevice."Line1" {
        }
 }
 
-SectionDevice."Line2" {
-       Comment "Line 3-4"
-
-       Value {
-               PlaybackPriority 100
+If.scarlett_2i4 {
+       Condition {
+               Type String
+               String1 "${var:PlaybackChannels}"
+               String2 "4"
        }
-       Macro.pcm_split.SplitPCMDevice {
-               Name "scarlett2i4_stereo_out"
-               Direction Playback
-               HWChannels 4
-               Channels 2
-               Channel0 2
-               Channel1 3
-               ChannelPos0 FL
-               ChannelPos1 FR
+       True.SectionDevice."Line2" {
+               Comment "Line 3-4"
+
+               Value {
+                       PlaybackPriority 100
+               }
+               Macro.pcm_split.SplitPCMDevice {
+                       Name "scarlett2i_stereo_out"
+                       Direction Playback
+                       HWChannels 4
+                       Channels 2
+                       Channel0 2
+                       Channel1 3
+                       ChannelPos0 FL
+                       ChannelPos1 FR
+               }
        }
 }
 
@@ -69,7 +76,7 @@ SectionDevice."Mic1" {
                CapturePriority 200
        }
        Macro.pcm_split.SplitPCMDevice {
-               Name "scarlett2i4_mono_in"
+               Name "scarlett2i_mono_in"
                Direction Capture
                HWChannels 2
                Channels 1
@@ -85,7 +92,7 @@ SectionDevice."Mic2" {
                CapturePriority 100
        }
        Macro.pcm_split.SplitPCMDevice {
-               Name "scarlett2i4_mono_in"
+               Name "scarlett2i_mono_in"
                Direction Capture
                HWChannels 2
                Channels 1

diff --git a/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2.conf b/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2.conf
new file mode 100644 (file)
index 0000000..ee5b0b5
--- /dev/null
+++ b/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2.conf
@@ -0,0 +1,22 @@
+Define.PlaybackChannels 4
+
+If.scarlett_2i4 {
+       Condition {
+               Type String
+               Haystack "${CardComponents}"
+               Needle "USB1235:8202"
+       }
+       True.Define.PlaybackChannels 2
+}
+
+Comment "Focusrite Scarlett 2i${var:PlaybackChannels} Gen 2"
+
+SectionUseCase."HiFi" {
+    Comment "Default"
+    File "/USB-Audio/Focusrite/Scarlett-2i-gen2-HiFi.conf"
+}
+
+Define.DirectPlaybackChannels "${var:PlaybackChannels}"
+Define.DirectCaptureChannels 2
+
+Include.dhw.File "/common/direct.conf"

diff --git a/ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2.conf b/ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2.conf
deleted file mode 100644 (file)
index ffc296d..0000000
--- a/ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-Comment "Focusrite Scarlett 2i4 Gen 2"
-
-SectionUseCase."HiFi" {
-    Comment "Default"
-    File "/USB-Audio/Focusrite/Scarlett-2i4-gen2-HiFi.conf"
-}
-
-Define.DirectPlaybackChannels 4
-Define.DirectCaptureChannels 2
-
-Include.dhw.File "/common/direct.conf"

diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
index 90a88d4557bc38396ed17c896d822db77ea86142..3479ba15dd1e2f54b96677fc8835186750d94266 100644 (file)
--- a/ucm2/USB-Audio/USB-Audio.conf
+++ b/ucm2/USB-Audio/USB-Audio.conf
@@ -135,14 +135,14 @@ If.goxlr {
        True.Define.ProfileName "GoXLR/GoXLR"
 }
 
-If.focusrite-scarlett-2i4-gen2 {
+If.focusrite-scarlett-2i-gen2 {
        Condition {
-               Type String
-               Haystack "${CardComponents}"
-               Needle "USB1235:8200"
+               Type RegexMatch
+               String "${CardComponents}"
+               Regex "USB1235:820[02]"
        }
        True.Define {
-               ProfileName "Focusrite/Scarlett-2i4-gen2"
+               ProfileName "Focusrite/Scarlett-2i-gen2"
        }
 }