Merge branch 'master' of git@git.alsa-project.org:alsa-lib

This commit is contained in:
Takashi Iwai 2009-02-17 17:01:06 +01:00
commit 59826eab77

View file

@ -13,7 +13,7 @@ CMI8788.pcm.front.0 {
card $CARD card $CARD
} }
# default with dmix+softvol & dsnoop # default with dmix & dsnoop
CMI8788.pcm.default { CMI8788.pcm.default {
@args [ CARD ] @args [ CARD ]
@args.CARD { @args.CARD {
@ -22,17 +22,10 @@ CMI8788.pcm.default {
type asym type asym
playback.pcm { playback.pcm {
type plug type plug
slave.pcm {
type softvol
slave.pcm { slave.pcm {
@func concat @func concat
strings [ "dmix:" $CARD ",FORMAT=S32_LE" ] strings [ "dmix:" $CARD ",FORMAT=S32_LE" ]
} }
control {
name "PCM Playback Volume"
card $CARD
}
}
} }
capture.pcm { capture.pcm {
type plug type plug