Add default dmix rate and format definitions in alsa.conf

Added defaults.pcm.dmix_format and dmix_rate definitions to
alsa.conf.  They are referred as the default values of standard
dmix/dsnoop PCM.

diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
index e37100415903a992254790d644a26a5f500a0b94..38140f77ade5bc688ef91d5ecc84cf8976df2fa7 100644 (file)
--- a/src/conf/alsa.conf
+++ b/src/conf/alsa.conf
@@ -58,6 +58,8 @@ defaults.pcm.ipc_key 5678293
 defaults.pcm.ipc_gid audio
 defaults.pcm.ipc_perm 0660
 defaults.pcm.dmix_max_periods 0
+defaults.pcm.dmix_rate 48000
+defaults.pcm.dmix_format S16_LE
 defaults.pcm.front.card defaults.pcm.card
 defaults.pcm.front.device defaults.pcm.device
 defaults.pcm.rear.card defaults.pcm.card

diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf
index 32700f240491e7318ee2fd45f42e6b7531be4601..68c609eac6de5f423b49b119978fb07f991f501f 100644 (file)
--- a/src/conf/pcm/dmix.conf
+++ b/src/conf/pcm/dmix.conf
@@ -18,11 +18,17 @@ pcm.!dmix {
        }
        @args.FORMAT {
                type string
-               default S16_LE
+               default {
+                       @func refer
+                       name defaults.pcm.dmix_format
+               }
        }
        @args.RATE {
                type integer
-               default 48000
+               default {
+                       @func refer
+                       name defaults.pcm.dmix_rate
+               }
        }
        type dmix
        ipc_key {

diff --git a/src/conf/pcm/dsnoop.conf b/src/conf/pcm/dsnoop.conf
index dfdcf58de356c57460969a95297a9d4738129a3a..51e58bd45d258b33f663cd1e73b41bbff4890dc6 100644 (file)
--- a/src/conf/pcm/dsnoop.conf
+++ b/src/conf/pcm/dsnoop.conf
@@ -18,11 +18,17 @@ pcm.!dsnoop {
        }
        @args.FORMAT {
                type string
-               default S16
+               default {
+                       @func refer
+                       name defaults.pcm.dmix_format
+               }
        }
        @args.RATE {
                type integer
-               default 48000
+               default {
+                       @func refer
+                       name defaults.pcm.dmix_rate
+               }
        }
        type dsnoop
        ipc_key {