USB-Audio: fixes for M-Audio Fast Track Ultra

- use new USB-Audio.conf macros
- follow UCM device numbering rule (continuous - use labeling)

Fixes: 27d3b45 ("Add UCM2 configuration for M-Audio Fast Track Ultra")
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/USB-Audio/M-Audio/Fast-Track-Ultra-HiFi.conf b/ucm2/USB-Audio/M-Audio/Fast-Track-Ultra-HiFi.conf
index fc0169c41acec4a47ae7f986bdb482020ef613e0..71639d1cf5772b8941deb06d433e885c4d936a47 100644 (file)
--- a/ucm2/USB-Audio/M-Audio/Fast-Track-Ultra-HiFi.conf
+++ b/ucm2/USB-Audio/M-Audio/Fast-Track-Ultra-HiFi.conf
@@ -237,7 +237,7 @@ LibraryConfig.remap.Config {
        }
 }
 
-SectionDevice."Line1" {
+SectionDevice."Line:12" {
        Comment "Stereo Output 1/2 (Main - Headphones 1)"
 
        Macro.pcm_split.SplitPCMDevice {
@@ -256,7 +256,7 @@ SectionDevice."Line1" {
        }
 }
 
-SectionDevice."Line2" {
+SectionDevice."Line:34" {
        Comment "Stereo Output 3/4 (Headphones 2)"
 
        Macro.pcm_split.SplitPCMDevice {
@@ -275,7 +275,7 @@ SectionDevice."Line2" {
        }
 }
 
-SectionDevice."Line3" {
+SectionDevice."Line:56" {
        Comment "Stereo Output 5/6"
 
        Macro.pcm_split.SplitPCMDevice {
@@ -294,7 +294,7 @@ SectionDevice."Line3" {
        }
 }
 
-SectionDevice."Line4" {
+SectionDevice."Line:78" {
        Comment "Stereo Output 7/8 (S/PDIF)"
 
        Macro.pcm_split.SplitPCMDevice {
@@ -317,7 +317,7 @@ SectionDevice."Line4" {
 # and then use 5/6 from the TRS input from the back (probably stereo).
 # 7/8 is only connected to S/PDIF so almost always stereo.
 
-SectionDevice."Mic1" {
+SectionDevice."Mic:1" {
        Comment "Input 1"
 
        Macro.pcm_split.SplitPCMDevice {
@@ -330,7 +330,7 @@ SectionDevice."Mic1" {
        }
 }
 
-SectionDevice."Mic2" {
+SectionDevice."Mic:2" {
        Comment "Input 2"
 
        Macro.pcm_split.SplitPCMDevice {
@@ -343,7 +343,7 @@ SectionDevice."Mic2" {
        }
 }
 
-SectionDevice."Mic3" {
+SectionDevice."Mic:3" {
        Comment "Input 3"
 
        Macro.pcm_split.SplitPCMDevice {
@@ -356,7 +356,7 @@ SectionDevice."Mic3" {
        }
 }
 
-SectionDevice."Mic4" {
+SectionDevice."Mic:4" {
        Comment "Input 4"
 
        Macro.pcm_split.SplitPCMDevice {
@@ -369,7 +369,7 @@ SectionDevice."Mic4" {
        }
 }
 
-SectionDevice."Line56" {
+SectionDevice."Line:56" {
        Comment "Input 5/6"
 
        Macro.pcm_split.SplitPCMDevice {
@@ -384,7 +384,7 @@ SectionDevice."Line56" {
        }
 }
 
-SectionDevice."SPDIF78" {
+SectionDevice."SPDIF:78" {
        Comment "Input 7/8 (S/PDIF)"
 
        Macro.pcm_split.SplitPCMDevice {

diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
index ed5cce148da2db23f10ba62f66245da44ec5daab..ff490347644732395e0b17e213ff5845fcf88b04 100644 (file)
--- a/ucm2/USB-Audio/USB-Audio.conf
+++ b/ucm2/USB-Audio/USB-Audio.conf
@@ -166,6 +166,7 @@ Macro.roland-bridgecastv2.RegexMatch        "Id='0582:03((1e)|(0d))' Profile='Roland/Br
 
 Macro.roland-bridgecastx.StringMatch   "Id='0582:0321' Profile='Roland/BridgeCastXV2'"
 Macro.tascam-m12.StringMatch           "Id='0644:805f' Profile='TASCAM/Model12'"
+Macro.maudio-fast-track-ultra.StringMatch "Id='0763:2080' Profile='M-Audio/Fast-Track-Ultra' Remap='yes'"
 
 If.motu-m246 {
        Condition {
@@ -268,18 +269,6 @@ Macro.ssl2.RegexMatch                      "Id='31e9:000[1289]' Profile='SolidStateLabs/SSL2'"
 Macro.beacn-mic.StringMatch            "Id='33ae:0001' Profile='Beacn/Beacn-Mic'"
 Macro.beacn-studio.RegexMatch          "Id='33ae:[04]003' Profile='Beacn/Beacn-Studio'"
 
-If.maudio-fast-track-ultra {
-       Condition {
-               Type String
-               Haystack "${CardComponents}"
-               Needle "USB0763:2080"
-       }
-       True.Define {
-               ProfileName "M-Audio/Fast-Track-Ultra"
-               MixerRemap yes
-       }
-}
-
 #
 # end of device specific configuration block
 #