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

Added surround41 and surround50 definitions

Browse source
This commit is contained in:
Jaroslav Kysela 2003-08-12 09:34:38 +00:00
parent 63c19961b9
commit e09736109e
16 changed files with 205 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/conf/alsa.conf
View file

@ -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

2
src/conf/cards/Audigy.conf
View file

@ -126,6 +126,8 @@ Audigy.pcm.surround40.0 {
]
}
<confdir:pcm/surround41.conf>
<confdir:pcm/surround50.conf>
<confdir:pcm/surround51.conf>
Audigy.pcm.surround51.0 {

2
src/conf/cards/CMI8738-MC6.conf
View file

@ -55,6 +55,8 @@ CMI8738-MC6.pcm.surround40.0 {
}
<confdir:pcm/surround41.conf>
<confdir:pcm/surround50.conf>
<confdir:pcm/surround51.conf>
CMI8738-MC6.pcm.surround51.0 "cards.CMI8738-MC6.pcm.front.0"

2
src/conf/cards/CS46xx.conf
View file

@ -74,6 +74,8 @@ CS46xx.pcm.surround40.0 {
]
}
<confdir:pcm/surround41.conf>
<confdir:pcm/surround50.conf>
<confdir:pcm/surround51.conf>
CS46xx.pcm.surround51.0 {

2
src/conf/cards/EMU10K1.conf
View file

@ -146,6 +146,8 @@ EMU10K1.pcm.surround40.0 {
]
}
<confdir:pcm/surround41.conf>
<confdir:pcm/surround50.conf>
<confdir:pcm/surround51.conf>
EMU10K1.pcm.surround51.0 {

2
src/conf/cards/FM801.conf
View file

@ -18,6 +18,8 @@ FM801.pcm.front.0 {
FM801.pcm.surround40.0 "cards.FM801.pcm.front.0"
<confdir:pcm/surround41.conf>
<confdir:pcm/surround50.conf>
<confdir:pcm/surround51.conf>
FM801.pcm.surround51.0 "cards.FM801.pcm.front.0"

2
src/conf/cards/ICE1712.conf
View file

@ -36,6 +36,8 @@ ICE1712.pcm.surround40.0 {
}
}
<confdir:pcm/surround41.conf>
<confdir:pcm/surround50.conf>
<confdir:pcm/surround51.conf>
ICE1712.pcm.surround51.0 {

2
src/conf/cards/ICE1724.conf
View file

@ -36,6 +36,8 @@ ICE1724.pcm.surround40.0 {
}
}
<confdir:pcm/surround41.conf>
<confdir:pcm/surround50.conf>
<confdir:pcm/surround51.conf>
ICE1724.pcm.surround51.0 {

2
src/conf/cards/ICH.conf
View file

@ -18,6 +18,8 @@ ICH.pcm.front.0 {
ICH.pcm.surround40.0 "cards.ICH.pcm.front.0"
<confdir:pcm/surround41.conf>
<confdir:pcm/surround50.conf>
<confdir:pcm/surround51.conf>
ICH.pcm.surround51.0 {

2
src/conf/cards/NFORCE.conf
View file

@ -18,6 +18,8 @@ NFORCE.pcm.front.0 {
NFORCE.pcm.surround40.0 "cards.NFORCE.pcm.front.0"
<confdir:pcm/surround41.conf>
<confdir:pcm/surround50.conf>
<confdir:pcm/surround51.conf>
NFORCE.pcm.surround51.0 {

49
src/conf/cards/SI7018.conf
View file

@ -78,6 +78,55 @@ SI7018.pcm.surround40.0 {
]
}
<confdir:pcm/surround41.conf>
<confdir:pcm/surround50.conf>
<confdir:pcm/surround51.conf>
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 }
]
}
<confdir:pcm/iec958.conf>
SI7018.pcm.iec958.0 {

2
src/conf/cards/VIA8233.conf
View file

@ -26,6 +26,8 @@ VIA8233.pcm.surround40.0 {
device 1
}
<confdir:pcm/surround41.conf>
<confdir:pcm/surround50.conf>
<confdir:pcm/surround51.conf>
VIA8233.pcm.surround51.0 "cards.VIA8233.pcm.surround40.0"

2
src/conf/cards/VIA8233A.conf
View file

@ -42,6 +42,8 @@ VIA8233A.pcm.surround40.0 {
}
}
<confdir:pcm/surround41.conf>
<confdir:pcm/surround50.conf>
<confdir:pcm/surround51.conf>
VIA8233A.pcm.surround51.0 {

6
src/conf/pcm/Makefile.am
View file

@ -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)

62
src/conf/pcm/surround41.conf Normal file
View file

@ -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
}

62
src/conf/pcm/surround50.conf Normal file
View file

@ -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
}