From: Jaroslav Kysela Date: Tue, 4 May 2021 18:48:52 +0000 (+0200) Subject: alsa: conf - use card number roots for device redirects X-Git-Tag: v1.2.5~31 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=a468505c9653545cc709025b85ca2b124f768023;p=alsa-lib.git alsa: conf - use card number roots for device redirects The change device definitions (pcm.front etc.) from the driver roots (cards.) to the card number roots (cards.). This will allow us to do custom overrides (like UCM) in /var/lib/alsa/card.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 --- diff --git a/src/conf/ctl/default.conf b/src/conf/ctl/default.conf index 8bf4f1d1..022117ee 100644 --- 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 4ef6f497..838014c8 100644 --- 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 864a9033..6f0fa341 100644 --- 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 50e573da..219fb2b7 100644 --- 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 f4336e5f..20df3497 100644 --- 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 a5839b3d..b0892e01 100644 --- 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 aad7065c..67e8eaef 100644 --- 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 2b084d6f..df0a7da2 100644 --- 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 0af0e72c..cff73a25 100644 --- 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 85c70aab..74979b94 100644 --- 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 4a81af09..ac1be4b2 100644 --- 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 ad19507b..612133db 100644 --- 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 7c615022..8dc6a183 100644 --- 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 cb6c0445..2943c464 100644 --- 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 70d54069..72f8e587 100644 --- 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 d0236e42..adf94d15 100644 --- 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 66792dde..a4feba4c 100644 --- 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