From: Jaroslav Kysela Date: Tue, 12 Aug 2003 09:34:38 +0000 (+0000) Subject: Added surround41 and surround50 definitions X-Git-Tag: v1.0.3~112 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=e09736109edc978c0e676cbbb5bfef84bdd1d666;p=alsa-lib.git Added surround41 and surround50 definitions --- diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf index 0b1642a6..4d742308 100644 --- a/src/conf/alsa.conf +++ b/src/conf/alsa.conf @@ -61,6 +61,10 @@ defaults.pcm.center_lfe.card defaults.pcm.card defaults.pcm.center_lfe.device defaults.pcm.device defaults.pcm.surround40.card defaults.pcm.card defaults.pcm.surround40.device defaults.pcm.device +defaults.pcm.surround41.card defaults.pcm.card +defaults.pcm.surround41.device defaults.pcm.device +defaults.pcm.surround50.card defaults.pcm.card +defaults.pcm.surround50.device defaults.pcm.device defaults.pcm.surround51.card defaults.pcm.card defaults.pcm.surround51.device defaults.pcm.device defaults.pcm.iec958.card defaults.pcm.card @@ -313,6 +317,8 @@ pcm.front cards.pcm.front pcm.rear cards.pcm.rear pcm.center_lfe cards.pcm.center_lfe pcm.surround40 cards.pcm.surround40 +pcm.surround41 cards.pcm.surround41 +pcm.surround50 cards.pcm.surround50 pcm.surround51 cards.pcm.surround51 pcm.iec958 cards.pcm.iec958 pcm.spdif cards.pcm.iec958 diff --git a/src/conf/cards/Audigy.conf b/src/conf/cards/Audigy.conf index e0f73c4c..8d1e4f3f 100644 --- a/src/conf/cards/Audigy.conf +++ b/src/conf/cards/Audigy.conf @@ -126,6 +126,8 @@ Audigy.pcm.surround40.0 { ] } + + Audigy.pcm.surround51.0 { diff --git a/src/conf/cards/CMI8738-MC6.conf b/src/conf/cards/CMI8738-MC6.conf index dfe00de5..34413d6c 100644 --- a/src/conf/cards/CMI8738-MC6.conf +++ b/src/conf/cards/CMI8738-MC6.conf @@ -55,6 +55,8 @@ CMI8738-MC6.pcm.surround40.0 { } + + CMI8738-MC6.pcm.surround51.0 "cards.CMI8738-MC6.pcm.front.0" diff --git a/src/conf/cards/CS46xx.conf b/src/conf/cards/CS46xx.conf index 4dc4370f..d09834e3 100644 --- a/src/conf/cards/CS46xx.conf +++ b/src/conf/cards/CS46xx.conf @@ -74,6 +74,8 @@ CS46xx.pcm.surround40.0 { ] } + + CS46xx.pcm.surround51.0 { diff --git a/src/conf/cards/EMU10K1.conf b/src/conf/cards/EMU10K1.conf index 517a0e04..5012080f 100644 --- a/src/conf/cards/EMU10K1.conf +++ b/src/conf/cards/EMU10K1.conf @@ -146,6 +146,8 @@ EMU10K1.pcm.surround40.0 { ] } + + EMU10K1.pcm.surround51.0 { diff --git a/src/conf/cards/FM801.conf b/src/conf/cards/FM801.conf index 47299c1c..8b0ba3e2 100644 --- a/src/conf/cards/FM801.conf +++ b/src/conf/cards/FM801.conf @@ -18,6 +18,8 @@ FM801.pcm.front.0 { FM801.pcm.surround40.0 "cards.FM801.pcm.front.0" + + FM801.pcm.surround51.0 "cards.FM801.pcm.front.0" diff --git a/src/conf/cards/ICE1712.conf b/src/conf/cards/ICE1712.conf index 9b23d25c..c984a857 100644 --- a/src/conf/cards/ICE1712.conf +++ b/src/conf/cards/ICE1712.conf @@ -36,6 +36,8 @@ ICE1712.pcm.surround40.0 { } } + + ICE1712.pcm.surround51.0 { diff --git a/src/conf/cards/ICE1724.conf b/src/conf/cards/ICE1724.conf index b1fd42a8..2dd8bb5c 100644 --- a/src/conf/cards/ICE1724.conf +++ b/src/conf/cards/ICE1724.conf @@ -36,6 +36,8 @@ ICE1724.pcm.surround40.0 { } } + + ICE1724.pcm.surround51.0 { diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf index 0a8d4b15..ee6aaf5e 100644 --- a/src/conf/cards/ICH.conf +++ b/src/conf/cards/ICH.conf @@ -18,6 +18,8 @@ ICH.pcm.front.0 { ICH.pcm.surround40.0 "cards.ICH.pcm.front.0" + + ICH.pcm.surround51.0 { diff --git a/src/conf/cards/NFORCE.conf b/src/conf/cards/NFORCE.conf index 5d895368..7413a9d9 100644 --- a/src/conf/cards/NFORCE.conf +++ b/src/conf/cards/NFORCE.conf @@ -18,6 +18,8 @@ NFORCE.pcm.front.0 { NFORCE.pcm.surround40.0 "cards.NFORCE.pcm.front.0" + + NFORCE.pcm.surround51.0 { diff --git a/src/conf/cards/SI7018.conf b/src/conf/cards/SI7018.conf index 4b5d6ebd..ace72d0f 100644 --- a/src/conf/cards/SI7018.conf +++ b/src/conf/cards/SI7018.conf @@ -78,6 +78,55 @@ SI7018.pcm.surround40.0 { ] } + + + + +SI7018.pcm.surround51.0 { + @args [ CARD ] + @args.CARD { + type string + } + type multi + slaves [ + { + pcm { + @func concat + strings [ + "cards.SI7018.pcm.front.0:CARD=" $CARD + ] + } + channels 2 + } + { + pcm { + @func concat + strings [ + "cards.SI7018.pcm.rear.0:CARD=" $CARD + ] + } + channels 2 + } + { + pcm { + @func concat + strings [ + "cards.SI7018.pcm.front.0:CARD=" $CARD + ] + } + channels 2 + } + ] + bindings [ + { slave 0 channel 0 } + { slave 0 channel 1 } + { slave 1 channel 0 } + { slave 1 channel 1 } + { slave 2 channel 0 } + { slave 2 channel 1 } + ] +} + SI7018.pcm.iec958.0 { diff --git a/src/conf/cards/VIA8233.conf b/src/conf/cards/VIA8233.conf index 8e0350bf..9eb84886 100644 --- a/src/conf/cards/VIA8233.conf +++ b/src/conf/cards/VIA8233.conf @@ -26,6 +26,8 @@ VIA8233.pcm.surround40.0 { device 1 } + + VIA8233.pcm.surround51.0 "cards.VIA8233.pcm.surround40.0" diff --git a/src/conf/cards/VIA8233A.conf b/src/conf/cards/VIA8233A.conf index 6db7bd68..f4dfe87d 100644 --- a/src/conf/cards/VIA8233A.conf +++ b/src/conf/cards/VIA8233A.conf @@ -42,6 +42,8 @@ VIA8233A.pcm.surround40.0 { } } + + VIA8233A.pcm.surround51.0 { diff --git a/src/conf/pcm/Makefile.am b/src/conf/pcm/Makefile.am index 3bbcbbd5..04910f7b 100644 --- a/src/conf/pcm/Makefile.am +++ b/src/conf/pcm/Makefile.am @@ -1,5 +1,7 @@ -cfg_files = front.conf rear.conf center_lfe.conf surround40.conf \ - surround51.conf iec958.conf +cfg_files = front.conf rear.conf center_lfe.conf \ + surround40.conf surround41.conf \ + surround50.conf surround51.conf \ + iec958.conf EXTRA_DIST = $(cfg_files) diff --git a/src/conf/pcm/surround41.conf b/src/conf/pcm/surround41.conf new file mode 100644 index 00000000..9e504fec --- /dev/null +++ b/src/conf/pcm/surround41.conf @@ -0,0 +1,62 @@ +# +# Hardware output from 4.1 speakers. +# Samples must be positioned: +# chn0 - front left +# chn1 - front right +# chn2 - rear left +# chn3 - rear right +# chn4 - LFE +# + +pcm.!surround41 { + @args [ CARD DEV ] + @args.CARD { + type string + default { + @func getenv + vars [ + ALSA_SURROUND41_CARD + ALSA_PCM_CARD + ALSA_CARD + ] + default { + @func refer + name defaults.pcm.surround41.card + } + } + } + @args.DEV { + type integer + default { + @func igetenv + vars [ + ALSA_SURROUND41_DEVICE + ] + default { + @func refer + name defaults.pcm.surround41.device + } + } + } + type route + slave.pcm { + @func refer + name { + @func concat + strings [ + "cards." + { + @func card_driver + card $CARD + } + ".pcm.surround51." $DEV ":CARD=" $CARD + ] + } + } + slave.channels 6 + ttable.0.0 1 + ttable.1.1 1 + ttable.2.2 1 + ttable.3.3 1 + ttable.4.5 1 +} diff --git a/src/conf/pcm/surround50.conf b/src/conf/pcm/surround50.conf new file mode 100644 index 00000000..7e658ec6 --- /dev/null +++ b/src/conf/pcm/surround50.conf @@ -0,0 +1,62 @@ +# +# Hardware output from 5.0 speakers. +# Samples must be positioned: +# chn0 - front left +# chn1 - front right +# chn2 - rear left +# chn3 - rear right +# chn4 - center +# + +pcm.!surround50 { + @args [ CARD DEV ] + @args.CARD { + type string + default { + @func getenv + vars [ + ALSA_SURROUND50_CARD + ALSA_PCM_CARD + ALSA_CARD + ] + default { + @func refer + name defaults.pcm.surround50.card + } + } + } + @args.DEV { + type integer + default { + @func igetenv + vars [ + ALSA_SURROUND50_DEVICE + ] + default { + @func refer + name defaults.pcm.surround50.device + } + } + } + type route + slave.pcm { + @func refer + name { + @func concat + strings [ + "cards." + { + @func card_driver + card $CARD + } + ".pcm.surround51." $DEV ":CARD=" $CARD + ] + } + } + slave.channels 6 + ttable.0.0 1 + ttable.1.1 1 + ttable.2.2 1 + ttable.3.3 1 + ttable.4.4 1 +}