mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: conf - use card number roots for device redirects

Browse source 
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>
This commit is contained in:
Jaroslav Kysela 2021-05-04 20:48:52 +02:00
parent 63f7745be5
commit a468505c96
17 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/conf/ctl/default.conf
View file

@ -27,7 +27,7 @@ ctl.!default {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_inum
card $CARD card $CARD
} }
".ctl.default:CARD=" $CARD ".ctl.default:CARD=" $CARD

2
src/conf/pcm/center_lfe.conf
View file

@ -40,7 +40,7 @@ pcm.!center_lfe {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_inum
card $CARD card $CARD
} }
".pcm.center_lfe." $DEV ":CARD=" $CARD ".pcm.center_lfe." $DEV ":CARD=" $CARD

2
src/conf/pcm/default.conf
View file

@ -27,7 +27,7 @@ pcm.!default {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_inum
card $CARD card $CARD
} }
".pcm.default:CARD=" $CARD ".pcm.default:CARD=" $CARD

6
src/conf/pcm/dmix.conf
View file

@ -77,7 +77,7 @@ pcm.!dmix {
strings [ strings [
"defaults.dmix." "defaults.dmix."
{ {
@func card_driver @func card_id
card $CARD card $CARD
} }
".period_size" ".period_size"
@ -92,7 +92,7 @@ pcm.!dmix {
strings [ strings [
"defaults.dmix." "defaults.dmix."
{ {
@func card_driver @func card_id
card $CARD card $CARD
} }
".period_time" ".period_time"
@ -107,7 +107,7 @@ pcm.!dmix {
strings [ strings [
"defaults.dmix." "defaults.dmix."
{ {
@func card_driver @func card_id
card $CARD card $CARD
} }
".periods" ".periods"

6
src/conf/pcm/dsnoop.conf
View file

@ -69,7 +69,7 @@ pcm.!dsnoop {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_id
card $CARD card $CARD
} }
".pcm.dsnoop.period_size" ".pcm.dsnoop.period_size"
@ -84,7 +84,7 @@ pcm.!dsnoop {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_id
card $CARD card $CARD
} }
".pcm.dsnoop.period_time" ".pcm.dsnoop.period_time"
@ -99,7 +99,7 @@ pcm.!dsnoop {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_id
card $CARD card $CARD
} }
".pcm.dsnoop.periods" ".pcm.dsnoop.periods"

2
src/conf/pcm/front.conf
View file

@ -40,7 +40,7 @@ pcm.!front {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_inum
card $CARD card $CARD
} }
".pcm.front." $DEV ":CARD=" $CARD ".pcm.front." $DEV ":CARD=" $CARD

2
src/conf/pcm/hdmi.conf
View file

@ -60,7 +60,7 @@ pcm.!hdmi {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_inum
card $CARD card $CARD
} }
".pcm.hdmi." $DEV ":" ".pcm.hdmi." $DEV ":"

2
src/conf/pcm/iec958.conf
View file

@ -60,7 +60,7 @@ pcm.!iec958 {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_inum
card $CARD card $CARD
} }
".pcm.iec958." $DEV ":" ".pcm.iec958." $DEV ":"

2
src/conf/pcm/modem.conf
View file

@ -38,7 +38,7 @@ pcm.!phoneline {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_inum
card $CARD card $CARD
} }
".pcm.modem." $DEV ":CARD=" $CARD ".pcm.modem." $DEV ":CARD=" $CARD

2
src/conf/pcm/rear.conf
View file

@ -40,7 +40,7 @@ pcm.!rear {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_inum
card $CARD card $CARD
} }
".pcm.rear." $DEV ":CARD=" $CARD ".pcm.rear." $DEV ":CARD=" $CARD

2
src/conf/pcm/side.conf
View file

@ -40,7 +40,7 @@ pcm.!side {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_inum
card $CARD card $CARD
} }
".pcm.side." $DEV ":CARD=" $CARD ".pcm.side." $DEV ":CARD=" $CARD

2
src/conf/pcm/surround21.conf
View file

@ -44,7 +44,7 @@ pcm.!surround21 {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_inum
card $CARD card $CARD
} }
".pcm.surround51." $DEV ":CARD=" $CARD ".pcm.surround51." $DEV ":CARD=" $CARD

2
src/conf/pcm/surround40.conf
View file

@ -45,7 +45,7 @@ pcm.!surround40 {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_inum
card $CARD card $CARD
} }
".pcm.surround40." $DEV ":CARD=" $CARD ".pcm.surround40." $DEV ":CARD=" $CARD

2
src/conf/pcm/surround41.conf
View file

@ -46,7 +46,7 @@ pcm.!surround41 {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_inum
card $CARD card $CARD
} }
".pcm.surround51." $DEV ":CARD=" $CARD ".pcm.surround51." $DEV ":CARD=" $CARD

2
src/conf/pcm/surround50.conf
View file

@ -46,7 +46,7 @@ pcm.!surround50 {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_inum
card $CARD card $CARD
} }
".pcm.surround51." $DEV ":CARD=" $CARD ".pcm.surround51." $DEV ":CARD=" $CARD

2
src/conf/pcm/surround51.conf
View file

@ -47,7 +47,7 @@ pcm.!surround51 {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_inum
card $CARD card $CARD
} }
".pcm.surround51." $DEV ":CARD=" $CARD ".pcm.surround51." $DEV ":CARD=" $CARD

2
src/conf/pcm/surround71.conf
View file

@ -49,7 +49,7 @@ pcm.!surround71 {
strings [ strings [
"cards." "cards."
{ {
@func card_driver @func card_inum
card $CARD card $CARD
} }
".pcm.surround71." $DEV ":CARD=" $CARD ".pcm.surround71." $DEV ":CARD=" $CARD