mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-11-24 07:00:01 -05:00
pcm config files cleanups and name hint extension
- remove device 0/subdevice 0 from configuration files (it's default)
- name_hint
- fixed parsing slaves
- obtain device numbers directly from 'type hw' configurations to
avoid poluting of configurations scripts with hint.device lines
This commit is contained in:
parent
b40a116b8e
commit
d7916981bf
57 changed files with 79 additions and 177 deletions
|
|
@ -53,5 +53,6 @@ pcm.!center_lfe {
|
|||
name defaults.namehint.basic
|
||||
}
|
||||
description "Center and Subwoofer speakers"
|
||||
device $DEV
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,25 +18,40 @@ pcm.!default {
|
|||
}
|
||||
}
|
||||
}
|
||||
# use card-specific definition if exists
|
||||
@func refer
|
||||
name {
|
||||
@func concat
|
||||
strings [
|
||||
"cards."
|
||||
{
|
||||
@func card_driver
|
||||
type empty
|
||||
slave.pcm {
|
||||
# use card-specific definition if exists
|
||||
@func refer
|
||||
name {
|
||||
@func concat
|
||||
strings [
|
||||
"cards."
|
||||
{
|
||||
@func card_driver
|
||||
card $CARD
|
||||
}
|
||||
".pcm.default1:CARD=" $CARD
|
||||
]
|
||||
}
|
||||
default {
|
||||
# use plughw as default
|
||||
type plug
|
||||
slave.pcm {
|
||||
type hw
|
||||
card $CARD
|
||||
}
|
||||
".pcm.default:CARD=" $CARD
|
||||
]
|
||||
hint.device 0
|
||||
}
|
||||
}
|
||||
default {
|
||||
# use plughw as default
|
||||
type plug
|
||||
slave.pcm {
|
||||
type hw
|
||||
card $CARD
|
||||
hint {
|
||||
description "Default Audio Device"
|
||||
device_output {
|
||||
@func refer
|
||||
name defaults.pcm.dmix.device
|
||||
}
|
||||
device_input {
|
||||
@func refer
|
||||
name defaults.pcm.dsnoop.device
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,5 +53,6 @@ pcm.!front {
|
|||
name defaults.namehint.basic
|
||||
}
|
||||
description "Front speakers"
|
||||
device $DEV
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,5 +78,6 @@ pcm.!iec958 {
|
|||
name defaults.namehint.basic
|
||||
}
|
||||
description "IEC958 (S/PDIF) Digital Audio Output"
|
||||
device $DEV
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,5 +53,6 @@ pcm.!rear {
|
|||
name defaults.namehint.basic
|
||||
}
|
||||
description "Rear speakers"
|
||||
device $DEV
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,5 +53,6 @@ pcm.!side {
|
|||
name defaults.namehint.basic
|
||||
}
|
||||
description "Side speakers"
|
||||
device $DEV
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,5 +52,8 @@ pcm.!surround40 {
|
|||
]
|
||||
}
|
||||
}
|
||||
hint.description "4.0 Surround output to Front and Rear speakers"
|
||||
hint {
|
||||
description "4.0 Surround output to Front and Rear speakers"
|
||||
device $DEV
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,5 +59,8 @@ 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"
|
||||
hint {
|
||||
description "4.1 Surround output to Front, Rear and Subwoofer speakers"
|
||||
device $DEV
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,5 +59,8 @@ 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"
|
||||
hint {
|
||||
description "5.0 Surround output to Front, Center and Rear speakers"
|
||||
device $DEV
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,5 +54,8 @@ pcm.!surround51 {
|
|||
]
|
||||
}
|
||||
}
|
||||
hint.description "5.1 Surround output to Front, Center, Rear and Subwoofer speakers"
|
||||
hint {
|
||||
description "5.1 Surround output to Front, Center, Rear and Subwoofer speakers"
|
||||
device $DEV
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,5 +56,8 @@ pcm.!surround71 {
|
|||
]
|
||||
}
|
||||
}
|
||||
hint.description "7.1 Surround output to Front, Center, Side, Rear and Woofer speakers"
|
||||
hint {
|
||||
description "7.1 Surround output to Front, Center, Side, Rear and Woofer speakers"
|
||||
device $DEV
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue