alsa: conf - use card number roots for device redirects

The change device definitions (pcm.front etc.) from the driver
roots (cards.<DRIVER_NAME>) to the card number roots (cards.<CARDNO>).

This will allow us to do custom overrides (like UCM) in
/var/lib/alsa/card<CARDNO>.conf.d.

For dmix and dsnoop default values, use the card ID instead
the card driver name. It's more flexible.

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

diff --git a/src/conf/ctl/default.conf b/src/conf/ctl/default.conf
index 8bf4f1d12997d7cbae30c11b6c3471b9857253ca..022117ee4f3f319219ad4cfff74bff96cac8e686 100644 (file)
--- a/src/conf/ctl/default.conf
+++ b/src/conf/ctl/default.conf
@@ -27,7 +27,7 @@ ctl.!default {
                        strings [
                                "cards."
                                {
-                                       @func card_driver
+                                       @func card_inum
                                        card $CARD
                                }
                                ".ctl.default:CARD=" $CARD

diff --git a/src/conf/pcm/center_lfe.conf b/src/conf/pcm/center_lfe.conf
index 4ef6f49768b25cf7ecca14de7e0b55f01aab363e..838014c828b5859d44a215bc119487aa7fc04423 100644 (file)
--- a/src/conf/pcm/center_lfe.conf
+++ b/src/conf/pcm/center_lfe.conf
@@ -40,7 +40,7 @@ pcm.!center_lfe {
                        strings [
                                "cards."
                                {
-                                       @func card_driver
+                                       @func card_inum
                                        card $CARD
                                }
                                ".pcm.center_lfe." $DEV ":CARD=" $CARD

diff --git a/src/conf/pcm/default.conf b/src/conf/pcm/default.conf
index 864a90339f152e9c33cadafd026a1fe71b8a0bb3..6f0fa3410d7a2e5966cfbd7b548cb3308e9af673 100644 (file)
--- a/src/conf/pcm/default.conf
+++ b/src/conf/pcm/default.conf
@@ -27,7 +27,7 @@ pcm.!default {
                        strings [
                                "cards."
                                {
-                                       @func card_driver
+                                       @func card_inum
                                        card $CARD
                                }
                                ".pcm.default:CARD=" $CARD

diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf
index 50e573da5d35acb05cfc41addaf0079f2535d1fd..219fb2b75f9ab52f41391ff9c1e7f2fbd1bd9d76 100644 (file)
--- a/src/conf/pcm/dmix.conf
+++ b/src/conf/pcm/dmix.conf
@@ -77,7 +77,7 @@ pcm.!dmix {
                                strings [
                                        "defaults.dmix."
                                        {
-                                               @func card_driver
+                                               @func card_id
                                                card $CARD
                                        }
                                        ".period_size"
@@ -92,7 +92,7 @@ pcm.!dmix {
                                strings [
                                        "defaults.dmix."
                                        {
-                                               @func card_driver
+                                               @func card_id
                                                card $CARD
                                        }
                                        ".period_time"
@@ -107,7 +107,7 @@ pcm.!dmix {
                                strings [
                                        "defaults.dmix."
                                        {
-                                               @func card_driver
+                                               @func card_id
                                                card $CARD
                                        }
                                        ".periods"

diff --git a/src/conf/pcm/dsnoop.conf b/src/conf/pcm/dsnoop.conf
index f4336e5f5e070a071bba21f573f64fabdd4ff645..20df3497b0057bd11bf5d5ff31833ad729f6ecb6 100644 (file)
--- a/src/conf/pcm/dsnoop.conf
+++ b/src/conf/pcm/dsnoop.conf
@@ -69,7 +69,7 @@ pcm.!dsnoop {
                                strings [
                                        "cards."
                                        {
-                                               @func card_driver
+                                               @func card_id
                                                card $CARD
                                        }
                                        ".pcm.dsnoop.period_size"
@@ -84,7 +84,7 @@ pcm.!dsnoop {
                                strings [
                                        "cards."
                                        {
-                                               @func card_driver
+                                               @func card_id
                                                card $CARD
                                        }
                                        ".pcm.dsnoop.period_time"
@@ -99,7 +99,7 @@ pcm.!dsnoop {
                                strings [
                                        "cards."
                                        {
-                                               @func card_driver
+                                               @func card_id
                                                card $CARD
                                        }
                                        ".pcm.dsnoop.periods"

diff --git a/src/conf/pcm/front.conf b/src/conf/pcm/front.conf
index a5839b3d067d8bff097c18dcec1cddd73030eb31..b0892e01f4c8300b0c7b5b955029157231f83353 100644 (file)
--- a/src/conf/pcm/front.conf
+++ b/src/conf/pcm/front.conf
@@ -40,7 +40,7 @@ pcm.!front {
                        strings [
                                "cards."
                                {
-                                       @func card_driver
+                                       @func card_inum
                                        card $CARD
                                }
                                ".pcm.front." $DEV ":CARD=" $CARD

diff --git a/src/conf/pcm/hdmi.conf b/src/conf/pcm/hdmi.conf
index aad7065c9f8721b19867598e22c97cee3da5d198..67e8eaef64c078141485ed83da951b786f0f71b9 100644 (file)
--- a/src/conf/pcm/hdmi.conf
+++ b/src/conf/pcm/hdmi.conf
@@ -60,7 +60,7 @@ pcm.!hdmi {
                        strings [
                                "cards."
                                {
-                                       @func card_driver
+                                       @func card_inum
                                        card $CARD
                                }
                                ".pcm.hdmi." $DEV ":"

diff --git a/src/conf/pcm/iec958.conf b/src/conf/pcm/iec958.conf
index 2b084d6fd1d75706830ee2813bd03de884b66e66..df0a7da2e3b432bc813ed4e812e317282ac647b5 100644 (file)
--- a/src/conf/pcm/iec958.conf
+++ b/src/conf/pcm/iec958.conf
@@ -60,7 +60,7 @@ pcm.!iec958 {
                        strings [
                                "cards."
                                {
-                                       @func card_driver
+                                       @func card_inum
                                        card $CARD
                                }
                                ".pcm.iec958." $DEV ":"

diff --git a/src/conf/pcm/modem.conf b/src/conf/pcm/modem.conf
index 0af0e72c568a0ecacde72549e81fc2f7e21d2adb..cff73a25ca6c1718e9ea822c46735e5415ec404e 100644 (file)
--- a/src/conf/pcm/modem.conf
+++ b/src/conf/pcm/modem.conf
@@ -38,7 +38,7 @@ pcm.!phoneline {
                strings [
                        "cards."
                        {
-                               @func card_driver
+                               @func card_inum
                                card $CARD
                        }
                        ".pcm.modem." $DEV ":CARD=" $CARD

diff --git a/src/conf/pcm/rear.conf b/src/conf/pcm/rear.conf
index 85c70aab180fe911203873a5da640a4406ca4105..74979b94c1944d86b8ac82602f4113066db95848 100644 (file)
--- a/src/conf/pcm/rear.conf
+++ b/src/conf/pcm/rear.conf
@@ -40,7 +40,7 @@ pcm.!rear {
                        strings [
                                "cards."
                                {
-                                       @func card_driver
+                                       @func card_inum
                                        card $CARD
                                }
                                ".pcm.rear." $DEV ":CARD=" $CARD

diff --git a/src/conf/pcm/side.conf b/src/conf/pcm/side.conf
index 4a81af09c8a684975501e6099522fad390810565..ac1be4b289ca821369f423fa746ac26c1a1246e5 100644 (file)
--- a/src/conf/pcm/side.conf
+++ b/src/conf/pcm/side.conf
@@ -40,7 +40,7 @@ pcm.!side {
                        strings [
                                "cards."
                                {
-                                       @func card_driver
+                                       @func card_inum
                                        card $CARD
                                }
                                ".pcm.side." $DEV ":CARD=" $CARD

diff --git a/src/conf/pcm/surround21.conf b/src/conf/pcm/surround21.conf
index ad19507bba58271adfac15d8d3baf154f791e5bf..612133dba88d20baff51f006089bfdc8a44ebeba 100644 (file)
--- a/src/conf/pcm/surround21.conf
+++ b/src/conf/pcm/surround21.conf
@@ -44,7 +44,7 @@ pcm.!surround21 {
                        strings [
                                "cards."
                                {
-                                       @func card_driver
+                                       @func card_inum
                                        card $CARD
                                }
                                ".pcm.surround51." $DEV ":CARD=" $CARD

diff --git a/src/conf/pcm/surround40.conf b/src/conf/pcm/surround40.conf
index 7c615022f5006f9dae9ae066db0a613eb69e54eb..8dc6a18395d2f658d7a4234abd94a21a497785fb 100644 (file)
--- a/src/conf/pcm/surround40.conf
+++ b/src/conf/pcm/surround40.conf
@@ -45,7 +45,7 @@ pcm.!surround40 {
                        strings [
                                "cards."
                                {
-                                       @func card_driver
+                                       @func card_inum
                                        card $CARD
                                }
                                ".pcm.surround40." $DEV ":CARD=" $CARD

diff --git a/src/conf/pcm/surround41.conf b/src/conf/pcm/surround41.conf
index cb6c0445ae07127781aba825f6437e4ada06fbdc..2943c4640da656107e591c7961656d6ed7ac993a 100644 (file)
--- a/src/conf/pcm/surround41.conf
+++ b/src/conf/pcm/surround41.conf
@@ -46,7 +46,7 @@ pcm.!surround41 {
                        strings [
                                "cards."
                                {
-                                       @func card_driver
+                                       @func card_inum
                                        card $CARD
                                }
                                ".pcm.surround51." $DEV ":CARD=" $CARD

diff --git a/src/conf/pcm/surround50.conf b/src/conf/pcm/surround50.conf
index 70d54069f8a3bd6cea149424b4e6c70cce01183d..72f8e587a25f23ebaedfa18528520a24291284ef 100644 (file)
--- a/src/conf/pcm/surround50.conf
+++ b/src/conf/pcm/surround50.conf
@@ -46,7 +46,7 @@ pcm.!surround50 {
                        strings [
                                "cards."
                                {
-                                       @func card_driver
+                                       @func card_inum
                                        card $CARD
                                }
                                ".pcm.surround51." $DEV ":CARD=" $CARD

diff --git a/src/conf/pcm/surround51.conf b/src/conf/pcm/surround51.conf
index d0236e42d3329c387cbb2f5972c18f191fea2bd7..adf94d1578b3e3ec63cc18a60381fe062dc833ce 100644 (file)
--- a/src/conf/pcm/surround51.conf
+++ b/src/conf/pcm/surround51.conf
@@ -47,7 +47,7 @@ pcm.!surround51 {
                        strings [
                                "cards."
                                {
-                                       @func card_driver
+                                       @func card_inum
                                        card $CARD
                                }
                                ".pcm.surround51." $DEV ":CARD=" $CARD

diff --git a/src/conf/pcm/surround71.conf b/src/conf/pcm/surround71.conf
index 66792ddebbc030d38bd5eb218580dd1d2d7960f4..a4feba4c6793f55ead5007b10748583401990f46 100644 (file)
--- a/src/conf/pcm/surround71.conf
+++ b/src/conf/pcm/surround71.conf
@@ -49,7 +49,7 @@ pcm.!surround71 {
                        strings [
                                "cards."
                                {
-                                       @func card_driver
+                                       @func card_inum
                                        card $CARD
                                }
                                ".pcm.surround71." $DEV ":CARD=" $CARD