conf: USB-Audio: allow custom definitions for "default" devices

Fixes: a9b129955659 ("USB-Audio.conf: fix definition for M-Audio AudioP...")
Signed-off-by: Alexander Tsoy <alexander@tsoy.me>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf
index f72ef12..cc8c718 100644 (file)
--- a/src/conf/cards/USB-Audio.conf
+++ b/src/conf/cards/USB-Audio.conf
@@ -67,7 +67,7 @@ USB-Audio.pcm.iec958_2_device {
 }
 
 
-# If a device requires non-standard definitions for front, surround40,
+# If a device requires non-standard definitions for front, default, surround40,
 # surround51, surround71 or iec958, they can be defined here.
 
 # M-Audio AudioPhile USB:
@@ -125,13 +125,13 @@ USB-Audio."Audio Advantage MicroII".pcm.iec958 {
        @args.AES2 { type integer }
        @args.AES3 { type integer }
 
-    type hooks
-    slave.pcm {
+       type hooks
+       slave.pcm {
                type hw
                card $CARD
-    }
+       }
 
-    hooks.0 {
+       hooks.0 {
                type ctl_elems
                hook_args [
                        {
@@ -174,41 +174,52 @@ USB-Audio.pcm.front.0 {
                card $CARD
                device 0
        }
-}      
+}
 
 USB-Audio.pcm.default {
        @args [ CARD ]
        @args.CARD { type string }
-       type asym
-       playback.pcm {
-               type plug
-               slave.pcm {
-                       @func refer
-                       name {
-                               @func concat
-                               strings [
-                                       "cards.USB-Audio.pcm.default_playback_dmix_"
-                                       {
-                                               @func refer
-                                               name {
-                                                       @func concat
-                                                       strings [
-                                                               "cards.USB-Audio.pcm.use_dmix."
-                                                               { @func card_name card $CARD }
-                                                       ]
+       @func refer
+       name {
+               @func concat
+               strings [
+                       "cards.USB-Audio."
+                       { @func card_name card $CARD }
+                       ".pcm.default:CARD=" $CARD
+               ]
+       }
+       default {
+               type asym
+               playback.pcm {
+                       type plug
+                       slave.pcm {
+                               @func refer
+                               name {
+                                       @func concat
+                                       strings [
+                                               "cards.USB-Audio.pcm.default_playback_dmix_"
+                                               {
+                                                       @func refer
+                                                       name {
+                                                               @func concat
+                                                               strings [
+                                                                       "cards.USB-Audio.pcm.use_dmix."
+                                                                       { @func card_name card $CARD }
+                                                               ]
+                                                       }
+                                                       default yes
                                                }
-                                               default yes
-                                       }
-                                       ":CARD=" $CARD
-                               ]
+                                               ":CARD=" $CARD
+                                       ]
+                               }
                        }
                }
-       }
-       capture.pcm {
-               type plug
-               slave.pcm {
-                       @func concat
-                       strings [ "dsnoop:" $CARD ]
+               capture.pcm {
+                       type plug
+                       slave.pcm {
+                               @func concat
+                               strings [ "dsnoop:" $CARD ]
+                       }
                }
        }
 }