Change dmix.conf to accept user configuration from defaults.dmix.<driver_id>.xxx

An attempt to fix problem described in reverted patch "Fix driver conf
parsing in snd_config_hook_load_for_all_cards()".

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf
index 4108ddb64aa79aeb780b97a6d767613a485bba2d..e62cb295278c1218150ad341a2e161ae7898e966 100644 (file)
--- a/src/conf/pcm/dmix.conf
+++ b/src/conf/pcm/dmix.conf
@@ -63,12 +63,12 @@ pcm.!dmix {
                        name {
                                @func concat
                                strings [
-                                       "cards."
+                                       "defaults.dmix."
                                        {
                                                @func card_driver
                                                card $CARD
                                        }
-                                       ".pcm.dmix.period_size"
+                                       ".period_size"
                                ]
                        }
                        default 1024
@@ -78,12 +78,12 @@ pcm.!dmix {
                        name {
                                @func concat
                                strings [
-                                       "cards."
+                                       "defaults.dmix."
                                        {
                                                @func card_driver
                                                card $CARD
                                        }
-                                       ".pcm.dmix.period_time"
+                                       ".period_time"
                                ]
                        }
                        default -1
@@ -93,12 +93,12 @@ pcm.!dmix {
                        name {
                                @func concat
                                strings [
-                                       "cards."
+                                       "defaults.dmix."
                                        {
                                                @func card_driver
                                                card $CARD
                                        }
-                                       ".pcm.dmix.periods"
+                                       ".periods"
                                ]
                        }
                        default 16