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

Fixes: a9b1299556 ("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>
This commit is contained in:
Alexander Tsoy 2017-06-18 23:23:03 +03:00 committed by Takashi Iwai
parent 6c53557300
commit c09e3b2d5b

View file

@ -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. # surround51, surround71 or iec958, they can be defined here.
# M-Audio AudioPhile USB: # M-Audio AudioPhile USB:
@ -125,13 +125,13 @@ USB-Audio."Audio Advantage MicroII".pcm.iec958 {
@args.AES2 { type integer } @args.AES2 { type integer }
@args.AES3 { type integer } @args.AES3 { type integer }
type hooks type hooks
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems
hook_args [ hook_args [
{ {
@ -174,41 +174,52 @@ USB-Audio.pcm.front.0 {
card $CARD card $CARD
device 0 device 0
} }
} }
USB-Audio.pcm.default { USB-Audio.pcm.default {
@args [ CARD ] @args [ CARD ]
@args.CARD { type string } @args.CARD { type string }
type asym @func refer
playback.pcm { name {
type plug @func concat
slave.pcm { strings [
@func refer "cards.USB-Audio."
name { { @func card_name card $CARD }
@func concat ".pcm.default:CARD=" $CARD
strings [ ]
"cards.USB-Audio.pcm.default_playback_dmix_" }
{ default {
@func refer type asym
name { playback.pcm {
@func concat type plug
strings [ slave.pcm {
"cards.USB-Audio.pcm.use_dmix." @func refer
{ @func card_name card $CARD } 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 {
capture.pcm { type plug
type plug slave.pcm {
slave.pcm { @func concat
@func concat strings [ "dsnoop:" $CARD ]
strings [ "dsnoop:" $CARD ] }
} }
} }
} }