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.

3 files changed, 18 insertions, 4 deletions

diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
index e3710041..38140f77 100644
--- 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 32700f24..68c609ea 100644
--- 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 dfdcf58d..51e58bd4 100644
--- 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 {