summaryrefslogtreecommitdiff
path: root/src/conf
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-07-26 13:05:53 +0200
committerTakashi Iwai <tiwai@suse.de>2011-07-27 15:24:09 +0200
commite6f990e5c9be5cac6f36924d20a75d0f69d27297 (patch)
treee218a41ecf2f0d65d4ec4afde1fb4029d891d877 /src/conf
parente2c2262403c5639c7ff96f47a43682ff16b7ae4f (diff)
Define "sysdefault" PCM and control
When "default" PCM and control definitions are overwritten by others like PulseAudio setup, the original system-default defition is lost. This is a problem when PA is temporarily (or intentionally) disabled and user wants to use the default dmix. This patch adds a new standard definition for the system-default, "sysdefault". This can be used for fallbacks. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'src/conf')
-rw-r--r--src/conf/alsa.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
index 1889f01e..a33c24e7 100644
--- a/src/conf/alsa.conf
+++ b/src/conf/alsa.conf
@@ -119,6 +119,7 @@ defaults.timer.subdevice 0
pcm.cards cards.pcm
pcm.default cards.pcm.default
+pcm.sysdefault cards.pcm.default
pcm.front cards.pcm.front
pcm.rear cards.pcm.rear
pcm.center_lfe cards.pcm.center_lfe
@@ -321,7 +322,7 @@ pcm.null {
# Control interface
#
-ctl.default {
+ctl.sysdefault {
type hw
card {
@func getenv
@@ -335,6 +336,7 @@ ctl.default {
}
}
}
+ctl.default ctl.sysdefault
ctl.hw {
@args [ CARD ]