mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-24 07:00:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

more name hint interace updates

Browse source 
- add long card name to device description
- create empty PCM plugin to allow right hint description parsing
- reorder devices in alsa.conf
- make namehint more configurable (using default.namehint.showall switch)
- add two levels basic and exteded for hints to default configuration files
- do not show direct device aliases
- removed all known memory leaks
This commit is contained in:
Jaroslav Kysela 2006-10-12 14:34:23 +02:00
parent aa7a0dd70b
commit 1300e70573
20 changed files with 456 additions and 322 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,16 +32,26 @@ pcm.!center_lfe {
}
}
}
@func refer
name {
@func concat
strings [
"cards."
{
@func card_driver
card $CARD
}
".pcm.center_lfe." $DEV ":CARD=" $CARD
]
type empty
slave.pcm {
@func refer
name {
@func concat
strings [
"cards."
{
@func card_driver
card $CARD
}
".pcm.center_lfe." $DEV ":CARD=" $CARD
]
}
}
hint {
show {
@func refer
name defaults.namehint.basic
}
description "Center and Subwoofer speakers"
}
}

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

@ -12,14 +12,14 @@ pcm.!dmix {
}
}
@args.DEV {
type string
type integer
default {
@func refer
name defaults.pcm.dmix.device
}
}
@args.SUBDEV {
type string
type integer
default -1
}
@args.FORMAT {
@ -120,6 +120,10 @@ pcm.!dmix {
}
}
hint {
show {
@func refer
name defaults.namehint.extended
}
description "Direct sample mixing device"
device $DEV
}

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

@ -12,14 +12,14 @@ pcm.!dsnoop {
}
}
@args.DEV {
type string
type integer
default {
@func refer
name defaults.pcm.dsnoop.device
}
}
@args.SUBDEV {
type string
type integer
default -1
}
@args.FORMAT {
@ -120,6 +120,10 @@ pcm.!dsnoop {
}
}
hint {
show {
@func refer
name defaults.namehint.extended
}
description "Direct sample snooping device"
device $DEV
}

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

@ -32,16 +32,26 @@ pcm.!front {
}
}
}
@func refer
name {
@func concat
strings [
"cards."
{
@func card_driver
card $CARD
}
".pcm.front." $DEV ":CARD=" $CARD
]
type empty
slave.pcm {
@func refer
name {
@func concat
strings [
"cards."
{
@func card_driver
card $CARD
}
".pcm.front." $DEV ":CARD=" $CARD
]
}
}
hint {
show {
@func refer
name defaults.namehint.basic
}
description "Front speakers"
}
}

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

@ -52,21 +52,31 @@ pcm.!iec958 {
# fs=48000Hz, clock accuracy=1000ppm
default 0x02
}
@func refer
name {
@func concat
strings [
"cards."
{
@func card_driver
card $CARD
}
".pcm.iec958." $DEV ":"
"CARD=" $CARD ","
"AES0=" $AES0 ","
"AES1=" $AES1 ","
"AES2=" $AES2 ","
"AES3=" $AES3
]
type empty
slave.pcm {
@func refer
name {
@func concat
strings [
"cards."
{
@func card_driver
card $CARD
}
".pcm.iec958." $DEV ":"
"CARD=" $CARD ","
"AES0=" $AES0 ","
"AES1=" $AES1 ","
"AES2=" $AES2 ","
"AES3=" $AES3
]
}
}
hint {
show {
@func refer
name defaults.namehint.basic
}
description "IEC958 (S/PDIF) Digital Audio Output"
}
}

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

@ -44,7 +44,7 @@ pcm.!phoneline {
".pcm.modem." $DEV ":CARD=" $CARD
]
}
hint 0
hint.show off
}
#
@ -102,5 +102,5 @@ pcm.!modem {
}
]
}
hint 0
hint.show off
}

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

@ -32,16 +32,26 @@ pcm.!rear {
}
}
}
@func refer
name {
@func concat
strings [
"cards."
{
@func card_driver
card $CARD
}
".pcm.rear." $DEV ":CARD=" $CARD
]
type empty
slave.pcm {
@func refer
name {
@func concat
strings [
"cards."
{
@func card_driver
card $CARD
}
".pcm.rear." $DEV ":CARD=" $CARD
]
}
}
hint {
show {
@func refer
name defaults.namehint.basic
}
description "Rear speakers"
}
}

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

@ -32,16 +32,26 @@ pcm.!side {
}
}
}
@func refer
name {
@func concat
strings [
"cards."
{
@func card_driver
card $CARD
}
".pcm.side." $DEV ":CARD=" $CARD
]
type empty
slave.pcm {
@func refer
name {
@func concat
strings [
"cards."
{
@func card_driver
card $CARD
}
".pcm.side." $DEV ":CARD=" $CARD
]
}
}
hint {
show {
@func refer
name defaults.namehint.basic
}
description "Side speakers"
}
}

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

@ -37,16 +37,20 @@ pcm.!surround40 {
}
}
}
@func refer
name {
@func concat
strings [
"cards."
{
@func card_driver
card $CARD
}
".pcm.surround40." $DEV ":CARD=" $CARD
]
type empty
slave.pcm {
@func refer
name {
@func concat
strings [
"cards."
{
@func card_driver
card $CARD
}
".pcm.surround40." $DEV ":CARD=" $CARD
]
}
}
hint.description "4.0 Surround output to Front and Rear speakers"
}

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

@ -59,4 +59,5 @@ pcm.!surround41 {
ttable.2.2 1
ttable.3.3 1
ttable.4.5 1
hint.description "4.1 Surround output to Front, Rear and Subwoofer speakers"
}

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

@ -59,4 +59,5 @@ pcm.!surround50 {
ttable.2.2 1
ttable.3.3 1
ttable.4.4 1
hint.description "5.0 Surround output to Front, Center and Rear speakers"
}

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

@ -39,16 +39,20 @@ pcm.!surround51 {
}
}
}
@func refer
name {
@func concat
strings [
"cards."
{
@func card_driver
card $CARD
}
".pcm.surround51." $DEV ":CARD=" $CARD
]
type empty
slave.pcm {
@func refer
name {
@func concat
strings [
"cards."
{
@func card_driver
card $CARD
}
".pcm.surround51." $DEV ":CARD=" $CARD
]
}
}
hint.description "5.1 Surround output to Front, Center, Rear and Subwoofer speakers"
}

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

@ -41,16 +41,20 @@ pcm.!surround71 {
}
}
}
@func refer
name {
@func concat
strings [
"cards."
{
@func card_driver
card $CARD
}
".pcm.surround71." $DEV ":CARD=" $CARD
]
type empty
slave.pcm {
@func refer
name {
@func concat
strings [
"cards."
{
@func card_driver
card $CARD
}
".pcm.surround71." $DEV ":CARD=" $CARD
]
}
}
hint.description "7.1 Surround output to Front, Center, Side, Rear and Woofer speakers"
}