tizen 2.3.1 release

[external/alsa-lib.git] / src / conf / alsa.conf

diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
index 1889f01..bc91df3 100644 (file)
--- a/src/conf/alsa.conf
+++ b/src/conf/alsa.conf
@@ -8,6 +8,13 @@
        {
                func load
                files [
+                       {
+                               @func concat
+                               strings [
+                                       { @func datadir }
+                                       "/alsa.conf.d/"
+                               ]
+                       }
                        "/etc/asound.conf"
                        "~/.asoundrc"
                ]
@@ -119,6 +126,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 +329,7 @@ pcm.null {
 #  Control interface
 #
        
-ctl.default {
+ctl.sysdefault {
        type hw
        card {
                @func getenv
@@ -335,6 +343,7 @@ ctl.default {
                }
        }
 }
+ctl.default ctl.sysdefault
 
 ctl.hw {
        @args [ CARD ]