ucm2: Add support for Steinberg UR22mkII

This device is basically an earlier model of the UR22C that already has
a configuration. The main functional difference is that the UR22mkII
only has 2 hardware channels for the inputs. I have also changed the
names/comments in the config to mostly match the text on the device
(Input 1/Input 2).

This configuration was tested with a Steinberg UR22mkII with firmware
version 1.04.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/626
Signed-off-by: Marius Renner <marius@mariusrenner.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/USB-Audio/Steinberg/UR22mkII-HiFi.conf b/ucm2/USB-Audio/Steinberg/UR22mkII-HiFi.conf
new file mode 100644 (file)
index 0000000..72cebc9
--- /dev/null
+++ b/ucm2/USB-Audio/Steinberg/UR22mkII-HiFi.conf
@@ -0,0 +1,55 @@
+Include.pcm_split.File "/common/pcm/split.conf"
+
+Macro [
+       {
+               SplitPCM {
+                       Name "steinberg_ur22mkii_mono_in"
+                       Direction Capture
+                       Channels 1
+                       HWChannels 2
+                       HWChannelPos0 MONO
+                       HWChannelPos1 MONO
+               }
+       }
+]
+
+SectionDevice."Line 1" {
+       Comment "Stereo Output"
+
+       Value {
+               PlaybackPriority 200
+               PlaybackPCM "hw:${CardId}"
+       }
+}
+
+SectionDevice."Input 1" {
+       Comment "Input 1"
+
+       Value {
+               CapturePriority 600
+       }
+       Macro.pcm_split.SplitPCMDevice {
+               Name "steinberg_ur22mkii_mono_in"
+               Direction Capture
+               HWChannels 2
+               Channels 1
+               Channel0 0
+               ChannelPos0 MONO
+       }
+}
+
+SectionDevice."Input 2" {
+       Comment "Input 2"
+
+       Value {
+               CapturePriority 500
+       }
+       Macro.pcm_split.SplitPCMDevice {
+               Name "steinberg_ur22mkii_mono_in"
+               Direction Capture
+               HWChannels 2
+               Channels 1
+               Channel0 1
+               ChannelPos0 MONO
+       }
+}

diff --git a/ucm2/USB-Audio/Steinberg/UR22mkII.conf b/ucm2/USB-Audio/Steinberg/UR22mkII.conf
new file mode 100644 (file)
index 0000000..0e798cb
--- /dev/null
+++ b/ucm2/USB-Audio/Steinberg/UR22mkII.conf
@@ -0,0 +1,11 @@
+Comment "Steinberg UR22mkII USB-Audio"
+
+SectionUseCase."HiFi" {
+       Comment "HiFi"
+       File "/USB-Audio/Steinberg/UR22mkII-HiFi.conf"
+}
+
+Define.DirectPlaybackChannels 2
+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 de32681f2686141c518ab44f95fa5577df31110b..6f662ee0523c363cca7cf2ec81d7f2fdd9592dcf 100644 (file)
--- a/ucm2/USB-Audio/USB-Audio.conf
+++ b/ucm2/USB-Audio/USB-Audio.conf
@@ -140,6 +140,15 @@ If.steinberg-ur22c {
        True.Define.ProfileName "Steinberg/UR22C"
 }
 
+If.steinberg-ur22mkii {
+       Condition {
+               Type String
+               Haystack "${CardComponents}"
+               Needle "USB0499:170f"
+       }
+       True.Define.ProfileName "Steinberg/UR22mkII"
+}
+
 If.steinberg-ur24c {
        Condition {
                Type String