ucm2: USB-Audio: Add BridgeCast-X USB1 Support

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/724
Signed-off-by: dasfuu <gitfuu@proton.me>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/USB-Audio/Roland/BridgeCastXV2-Hifi.conf b/ucm2/USB-Audio/Roland/BridgeCastXV2-Hifi.conf
index 426a15ab48c24ed7baf142bbc9e6cbe8734f9219..c840fed2e50d59f7efd11569be50df61b16c0dde 100644 (file)
--- a/ucm2/USB-Audio/Roland/BridgeCastXV2-Hifi.conf
+++ b/ucm2/USB-Audio/Roland/BridgeCastXV2-Hifi.conf
@@ -6,7 +6,7 @@ Macro [
                        Name "bc_stereo_out"
                        Direction Playback
                        Channels 2
-                       HWChannels 16
+                       HWChannels 14
                        HWChannelPos0 FL
                        HWChannelPos1 FR
                        HWChannelPos2 FL
@@ -23,8 +23,6 @@ Macro [
                        HWChannelPos11 FR
                        HWChannelPos12 FL
                        HWChannelPos13 FR
-                       HWChannelPos14 FL
-                       HWChannelPos15 FR
                }
        }
        {
@@ -44,7 +42,7 @@ Macro [
 ]
 
 SectionDevice."Line1" {
-       Comment "Chat L/R"
+       Comment "Chat"
 
        Value {
                PlaybackPriority 100
@@ -53,7 +51,7 @@ SectionDevice."Line1" {
        Macro.pcm_split.SplitPCMDevice {
                Name "bc_stereo_out"
                Direction Playback
-               HWChannels 16
+               HWChannels 14
                Channels 2
                Channel0 0
                Channel1 1
@@ -63,7 +61,7 @@ SectionDevice."Line1" {
 }
 
 SectionDevice."Line2" {
-       Comment "Game L/R"
+       Comment "Game"
 
        Value {
                PlaybackPriority 200
@@ -72,7 +70,7 @@ SectionDevice."Line2" {
        Macro.pcm_split.SplitPCMDevice {
                Name "bc_stereo_out"
                Direction Playback
-               HWChannels 16
+               HWChannels 14
                Channels 2
                Channel0 2
                Channel1 3
@@ -82,7 +80,7 @@ SectionDevice."Line2" {
 }
 
 SectionDevice."Line3" {
-       Comment "Music L/R"
+       Comment "Music"
 
        Value {
                PlaybackPriority 300
@@ -91,7 +89,7 @@ SectionDevice."Line3" {
        Macro.pcm_split.SplitPCMDevice {
                Name "bc_stereo_out"
                Direction Playback
-               HWChannels 16
+               HWChannels 14
                Channels 2
                Channel0 12
                Channel1 13
@@ -101,7 +99,7 @@ SectionDevice."Line3" {
 }
 
 SectionDevice."Line4" {
-       Comment "System L/R"
+       Comment "System"
 
        Value {
                PlaybackPriority 400
@@ -110,7 +108,7 @@ SectionDevice."Line4" {
        Macro.pcm_split.SplitPCMDevice {
                Name "bc_stereo_out"
                Direction Playback
-               HWChannels 16
+               HWChannels 14
                Channels 2
                Channel0 10
                Channel1 11
@@ -120,7 +118,7 @@ SectionDevice."Line4" {
 }
 
 SectionDevice."Line5" {
-       Comment "StreamMix"
+       Comment "Stream Mix"
 
        Value {
                CapturePriority 300
@@ -156,7 +154,7 @@ SectionDevice."Line6" {
 }
 
 SectionDevice."Line7" {
-       Comment "SFX"
+       Comment "Sub Mix"
 
        Value {
                CapturePriority 100

diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
index 3787fcb01e99f538bbd178de71691fc90c723376..d5c6db34049ba4f0c5907a69921606677e9393f7 100644 (file)
--- a/ucm2/USB-Audio/USB-Audio.conf
+++ b/ucm2/USB-Audio/USB-Audio.conf
@@ -169,7 +169,13 @@ Macro.roland-bridgecast.StringMatch        "Id='0582:02b7' Profile='Roland/BridgeCast'"
 # 0582:030d Bridge Cast One
 Macro.roland-bridgecastv2.RegexMatch   "Id='0582:03((1e)|(0d))' Profile='Roland/BridgeCastV2'"
 
-Macro.roland-bridgecastx.StringMatch   "Id='0582:0321' Profile='Roland/BridgeCastXV2'"
+Macro.roland-bridgecastx.RegexMatch    {
+       # Roland BridgeCaster X V2 USB1: 0582:0320
+       # Roland BridgeCaster X V2 USB2: 0582:0321
+       Id "0582:03((20)|(21))"
+       Profile "Roland/BridgeCastXV2"
+}
+
 Macro.tascam-m12.StringMatch           "Id='0644:805f' Profile='TASCAM/Model12'"
 Macro.tascam-us2xhr.StringMatch                "Id='0644:8070' Profile='TASCAM/US2x2HR'"
 Macro.maudio-fast-track-ultra.StringMatch "Id='0763:2080' Profile='M-Audio/Fast-Track-Ultra' Remap='yes'"