summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-17 17:01:06 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-17 17:01:06 +0100
commit59826eab7778847ed8ab2b49a98d69eeb8a945ee (patch)
treeae9dde3e76c7622d57c6630c3bbd491db96a459e
parent81241ffb8176bde284699e5839bb944db39c773c (diff)
parent91f1b4b96f6a73b7a4a36504e8c4c50cc3f0731b (diff)
downloadalsa-lib-59826eab7778847ed8ab2b49a98d69eeb8a945ee.tar.gz
Merge branch 'master' of git@git.alsa-project.org:alsa-lib
-rw-r--r--src/conf/cards/CMI8788.conf13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/conf/cards/CMI8788.conf b/src/conf/cards/CMI8788.conf
index 26910d51..0ca71e9d 100644
--- a/src/conf/cards/CMI8788.conf
+++ b/src/conf/cards/CMI8788.conf
@@ -13,7 +13,7 @@ CMI8788.pcm.front.0 {
card $CARD
}
-# default with dmix+softvol & dsnoop
+# default with dmix & dsnoop
CMI8788.pcm.default {
@args [ CARD ]
@args.CARD {
@@ -23,15 +23,8 @@ CMI8788.pcm.default {
playback.pcm {
type plug
slave.pcm {
- type softvol
- slave.pcm {
- @func concat
- strings [ "dmix:" $CARD ",FORMAT=S32_LE" ]
- }
- control {
- name "PCM Playback Volume"
- card $CARD
- }
+ @func concat
+ strings [ "dmix:" $CARD ",FORMAT=S32_LE" ]
}
}
capture.pcm {