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

pcm config files cleanups and name hint extension

Browse source 
- 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:
Jaroslav Kysela 2006-10-12 16:27:23 +02:00
parent b40a116b8e
commit d7916981bf
57 changed files with 79 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/conf/cards/AACI.conf
View file

@ -11,7 +11,6 @@ AACI.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
<confdir:pcm/surround40.conf> <confdir:pcm/surround40.conf>

3
src/conf/cards/ATIIXP-MODEM.conf
View file

@ -13,11 +13,10 @@ ATIIXP-MODEM.pcm.modem.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
slave.channels 2 slave.channels 2
slave.format S16_LE slave.format S16_LE
ttable.0.1 1 ttable.0.1 1
ttable.1.0 0 ttable.1.0 0
hint 0 hint.show off
} }

3
src/conf/cards/ATIIXP-SPDMA.conf
View file

@ -11,7 +11,6 @@ ATIIXP-SPDMA.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# default with dmix/dsnoop # default with dmix/dsnoop
@ -48,7 +47,6 @@ ATIIXP-SPDMA.pcm.surround40.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
channels 4 channels 4
} }
hooks.0 { hooks.0 {
@ -92,7 +90,6 @@ ATIIXP-SPDMA.pcm.surround51.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
channels 6 channels 6
} }
hooks.0 { hooks.0 {

6
src/conf/cards/ATIIXP.conf
View file

@ -11,7 +11,6 @@ ATIIXP.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# default with dmix/dsnoop # default with dmix/dsnoop
@ -48,7 +47,6 @@ ATIIXP.pcm.surround40.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
channels 4 channels 4
} }
hooks.0 { hooks.0 {
@ -92,7 +90,6 @@ ATIIXP.pcm.surround51.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
channels 6 channels 6
} }
hooks.0 { hooks.0 {
@ -166,21 +163,18 @@ ATIIXP.pcm.iec958.0 {
hook_args [ hook_args [
{ {
name "IEC958 Playback AC97-SPSA" name "IEC958 Playback AC97-SPSA"
device 0
lock true lock true
preserve true preserve true
value 3 value 3
} }
{ {
name "IEC958 Playback Default" name "IEC958 Playback Default"
device 0
lock true lock true
preserve true preserve true
value [ $AES0 $AES1 $AES2 $AES3 ] value [ $AES0 $AES1 $AES2 $AES3 ]
} }
{ {
name "IEC958 Playback Switch" name "IEC958 Playback Switch"
device 0
lock true lock true
preserve true preserve true
value true value true

1
src/conf/cards/AU8810.conf
View file

@ -11,7 +11,6 @@ AU8810.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
<confdir:pcm/iec958.conf> <confdir:pcm/iec958.conf>

1
src/conf/cards/AU8820.conf
View file

@ -11,5 +11,4 @@ AU8820.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }

1
src/conf/cards/AU8830.conf
View file

@ -11,7 +11,6 @@ AU8830.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
<confdir:pcm/surround40.conf> <confdir:pcm/surround40.conf>

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

@ -13,14 +13,12 @@ Audigy.pcm.front.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems
hook_args [ hook_args [
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Volume" name "EMU10K1 PCM Send Volume"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -37,7 +35,6 @@ Audigy.pcm.front.0 {
} }
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Routing" name "EMU10K1 PCM Send Routing"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -55,7 +52,6 @@ Audigy.pcm.front.0 {
] ]
} }
} }
<confdir:pcm/rear.conf> <confdir:pcm/rear.conf>
@ -69,14 +65,12 @@ Audigy.pcm.rear.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems
hook_args [ hook_args [
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Volume" name "EMU10K1 PCM Send Volume"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -106,14 +100,12 @@ Audigy.pcm.center_lfe.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems
hook_args [ hook_args [
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Volume" name "EMU10K1 PCM Send Volume"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -130,7 +122,6 @@ Audigy.pcm.center_lfe.0 {
} }
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Routing" name "EMU10K1 PCM Send Routing"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -257,7 +248,6 @@ Audigy.pcm.iec958.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
@ -266,7 +256,6 @@ Audigy.pcm.iec958.0 {
{ {
interface PCM interface PCM
name "IEC958 Playback Default" name "IEC958 Playback Default"
device 0
lock true lock true
preserve true preserve true
optional true optional true
@ -288,7 +277,6 @@ Audigy.pcm.iec958.0 {
} }
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Volume" name "EMU10K1 PCM Send Volume"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -305,7 +293,6 @@ Audigy.pcm.iec958.0 {
} }
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Routing" name "EMU10K1 PCM Send Routing"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true

16
src/conf/cards/Audigy2.conf
View file

@ -13,14 +13,12 @@ Audigy2.pcm.front.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems
hook_args [ hook_args [
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Volume" name "EMU10K1 PCM Send Volume"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -37,7 +35,6 @@ Audigy2.pcm.front.0 {
} }
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Routing" name "EMU10K1 PCM Send Routing"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -55,7 +52,6 @@ Audigy2.pcm.front.0 {
] ]
} }
} }
<confdir:pcm/rear.conf> <confdir:pcm/rear.conf>
@ -69,14 +65,12 @@ Audigy2.pcm.rear.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems
hook_args [ hook_args [
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Volume" name "EMU10K1 PCM Send Volume"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -106,14 +100,12 @@ Audigy2.pcm.center_lfe.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems
hook_args [ hook_args [
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Volume" name "EMU10K1 PCM Send Volume"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -130,7 +122,6 @@ Audigy2.pcm.center_lfe.0 {
} }
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Routing" name "EMU10K1 PCM Send Routing"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -160,14 +151,12 @@ Audigy2.pcm.side.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems
hook_args [ hook_args [
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Volume" name "EMU10K1 PCM Send Volume"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -184,7 +173,6 @@ Audigy2.pcm.side.0 {
} }
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Routing" name "EMU10K1 PCM Send Routing"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -369,7 +357,6 @@ Audigy2.pcm.iec958.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
@ -378,7 +365,6 @@ Audigy2.pcm.iec958.0 {
{ {
interface PCM interface PCM
name "IEC958 Playback Default" name "IEC958 Playback Default"
device 0
preserve true preserve true
optional true optional true
value [ $AES0 $AES1 $AES2 $AES3 ] value [ $AES0 $AES1 $AES2 $AES3 ]
@ -398,7 +384,6 @@ Audigy2.pcm.iec958.0 {
} }
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Volume" name "EMU10K1 PCM Send Volume"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -415,7 +400,6 @@ Audigy2.pcm.iec958.0 {
} }
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Routing" name "EMU10K1 PCM Send Routing"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true

1
src/conf/cards/Aureon51.conf
View file

@ -59,7 +59,6 @@ Aureon51.pcm.center_lfe.0 {
type hw type hw
card $CARD card $CARD
device 2 device 2
subdevice 0
} }
<confdir:pcm/side.conf> <confdir:pcm/side.conf>

1
src/conf/cards/Aureon71.conf
View file

@ -46,7 +46,6 @@ Aureon71.pcm.rear.0 {
type hw type hw
card $CARD card $CARD
device 2 device 2
subdevice 0
} }
<confdir:pcm/center_lfe.conf> <confdir:pcm/center_lfe.conf>

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

@ -34,7 +34,6 @@ CA0106.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
<confdir:pcm/rear.conf> <confdir:pcm/rear.conf>
@ -241,7 +240,6 @@ CA0106.pcm.iec958.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems

1
src/conf/cards/CMI8338-SWIEC.conf
View file

@ -12,7 +12,6 @@ CMI8338-SWIEC.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# default with dmix/dsnoop # default with dmix/dsnoop

1
src/conf/cards/CMI8338.conf
View file

@ -11,7 +11,6 @@ CMI8338.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# default with dmix/dsnoop # default with dmix/dsnoop

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

@ -11,7 +11,6 @@ CMI8738-MC6.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# default with dmix/dsnoop # default with dmix/dsnoop

1
src/conf/cards/CMI8738-MC8.conf
View file

@ -13,7 +13,6 @@ CMI8738-MC8.pcm.front.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
control { control {
name "PCM Playback Volume" name "PCM Playback Volume"

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

@ -11,7 +11,6 @@ CS46xx.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# default with plughw/dsnoop # default with plughw/dsnoop
@ -209,7 +208,6 @@ CS46xx.pcm.iec958.0 {
# for compatibility with older drivers # for compatibility with older drivers
interface PCM interface PCM
name "IEC958 Playback PCM Stream" name "IEC958 Playback PCM Stream"
device 0
lock true lock true
preserve true preserve true
optional true optional true

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

@ -13,14 +13,12 @@ EMU10K1.pcm.front.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems
hook_args [ hook_args [
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Volume" name "EMU10K1 PCM Send Volume"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -37,7 +35,6 @@ EMU10K1.pcm.front.0 {
} }
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Routing" name "EMU10K1 PCM Send Routing"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -67,14 +64,12 @@ EMU10K1.pcm.rear.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems
hook_args [ hook_args [
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Volume" name "EMU10K1 PCM Send Volume"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -104,7 +99,6 @@ EMU10K1.pcm.center_lfe.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems
@ -135,7 +129,6 @@ EMU10K1.pcm.center_lfe.0 {
# } # }
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Volume" name "EMU10K1 PCM Send Volume"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true
@ -152,7 +145,6 @@ EMU10K1.pcm.center_lfe.0 {
} }
{ {
interface PCM interface PCM
device 0
name "EMU10K1 PCM Send Routing" name "EMU10K1 PCM Send Routing"
index { @func private_pcm_subdevice } index { @func private_pcm_subdevice }
lock true lock true

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

@ -34,7 +34,6 @@ EMU10K1X.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
<confdir:pcm/rear.conf> <confdir:pcm/rear.conf>
@ -169,7 +168,6 @@ EMU10K1X.pcm.iec958.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems

1
src/conf/cards/ENS1370.conf
View file

@ -48,7 +48,6 @@ ENS1370.pcm.rear.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems

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

@ -11,7 +11,6 @@ ENS1371.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# default with dmix/dsnoop # default with dmix/dsnoop
@ -119,7 +118,6 @@ ENS1371.pcm.iec958.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems

1
src/conf/cards/ES1968.conf
View file

@ -9,5 +9,4 @@ ES1968.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }

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

@ -11,7 +11,6 @@ FM801.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# default with dmix/dsnoop # default with dmix/dsnoop
@ -70,7 +69,6 @@ FM801.pcm.iec958.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems

12
src/conf/cards/HDA-Intel.conf
View file

@ -13,13 +13,11 @@ HDA-Intel.pcm.front.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
control { control {
name "PCM Playback Volume" name "PCM Playback Volume"
card $CARD card $CARD
} }
hint.device 0
} }
# default with dmix+softvol & dsnoop # default with dmix+softvol & dsnoop
@ -50,16 +48,6 @@ HDA-Intel.pcm.default {
strings [ "dsnoop:" $CARD ] strings [ "dsnoop:" $CARD ]
} }
} }
hint {
device_output {
@func refer
name defaults.pcm.dmix.device
}
device_input {
@func refer
name defaults.pcm.dsnoop.device
}
}
} }
<confdir:pcm/surround40.conf> <confdir:pcm/surround40.conf>

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

@ -59,7 +59,6 @@ ICE1724.pcm.center_lfe.0 {
type hw type hw
card $CARD card $CARD
device 2 device 2
subdevice 0
} }
<confdir:pcm/side.conf> <confdir:pcm/side.conf>

3
src/conf/cards/ICH-MODEM.conf
View file

@ -11,6 +11,5 @@ ICH-MODEM.pcm.modem.0 {
} }
type hw type hw
card $CARD card $CARD
device 0 hint.show off
hint 0
} }

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

@ -13,7 +13,6 @@ ICH.pcm.front.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
control { control {
name "PCM Playback Volume" name "PCM Playback Volume"
@ -64,7 +63,6 @@ ICH.pcm.surround40.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
channels 4 channels 4
} }
hooks.0 { hooks.0 {
@ -123,7 +121,6 @@ ICH.pcm.surround51.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
channels 6 channels 6
} }
hooks.0 { hooks.0 {
@ -197,7 +194,6 @@ ICH.pcm.iec958.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems

6
src/conf/cards/ICH4.conf
View file

@ -13,7 +13,6 @@ ICH4.pcm.front.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
control { control {
name "PCM Playback Volume" name "PCM Playback Volume"
@ -64,7 +63,6 @@ ICH4.pcm.surround40.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
channels 4 channels 4
} }
hooks.0 { hooks.0 {
@ -115,7 +113,6 @@ ICH4.pcm.surround51.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
channels 6 channels 6
} }
hooks.0 { hooks.0 {
@ -194,7 +191,6 @@ ICH4.pcm.iec958.0 {
hook_args [ hook_args [
{ {
name "IEC958 Playback AC97-SPSA" name "IEC958 Playback AC97-SPSA"
device 0
lock true lock true
preserve true preserve true
value 3 value 3
@ -202,14 +198,12 @@ ICH4.pcm.iec958.0 {
} }
{ {
name "IEC958 Playback Default" name "IEC958 Playback Default"
device 0
lock true lock true
preserve true preserve true
value [ $AES0 $AES1 $AES2 $AES3 ] value [ $AES0 $AES1 $AES2 $AES3 ]
} }
{ {
name "IEC958 Playback Switch" name "IEC958 Playback Switch"
device 0
lock true lock true
preserve true preserve true
value true value true

1
src/conf/cards/Maestro3.conf
View file

@ -9,7 +9,6 @@ Maestro3.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# default with dmix/dsnoop # default with dmix/dsnoop

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

@ -13,7 +13,6 @@ NFORCE.pcm.front.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
control { control {
name "PCM Playback Volume" name "PCM Playback Volume"
@ -64,7 +63,6 @@ NFORCE.pcm.surround40.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
channels 4 channels 4
} }
hooks.0 { hooks.0 {
@ -123,7 +121,6 @@ NFORCE.pcm.surround51.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
channels 6 channels 6
} }
hooks.0 { hooks.0 {
@ -204,21 +201,18 @@ NFORCE.pcm.iec958.0 {
hook_args [ hook_args [
{ {
name "IEC958 Playback AC97-SPSA" name "IEC958 Playback AC97-SPSA"
device 0
lock true lock true
preserve true preserve true
value 0 value 0
} }
{ {
name "IEC958 Playback Default" name "IEC958 Playback Default"
device 0
lock true lock true
preserve true preserve true
value [ $AES0 $AES1 $AES2 $AES3 ] value [ $AES0 $AES1 $AES2 $AES3 ]
} }
{ {
name "IEC958 Playback Switch" name "IEC958 Playback Switch"
device 0
lock true lock true
preserve true preserve true
value true value true

1
src/conf/cards/PC-Speaker.conf
View file

@ -11,7 +11,6 @@ PC-Speaker.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# default with dmix & null # default with dmix & null

1
src/conf/cards/PMac.conf
View file

@ -11,7 +11,6 @@ PMac.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# default with dmix/dsnoop # default with dmix/dsnoop

1
src/conf/cards/PMacToonie.conf
View file

@ -13,7 +13,6 @@ PMacToonie.pcm.front.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
control { control {
name "PCM Playback Volume" name "PCM Playback Volume"

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

@ -11,7 +11,6 @@ RME9636.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# FIXME: This configuration is not valid for double-speed rates. # FIXME: This configuration is not valid for double-speed rates.
@ -42,7 +41,6 @@ RME9636.pcm.iec958.0 {
pcm { pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
channels 18 channels 18
} }

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

@ -11,7 +11,6 @@ RME9652.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# FIXME: This configuration is not valid for double-speed rates. # FIXME: This configuration is not valid for double-speed rates.
@ -42,7 +41,6 @@ RME9652.pcm.iec958.0 {
pcm { pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
channels 26 channels 26
} }

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

@ -13,7 +13,6 @@ SI7018.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
<confdir:pcm/rear.conf> <confdir:pcm/rear.conf>
@ -27,7 +26,6 @@ SI7018.pcm.rear.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems

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

@ -11,7 +11,6 @@ TRID4DWAVENX.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
<confdir:pcm/rear.conf> <confdir:pcm/rear.conf>
@ -25,7 +24,6 @@ TRID4DWAVENX.pcm.rear.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems

5
src/conf/cards/VIA686A.conf
View file

@ -14,7 +14,6 @@ VIA686A.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# default with dmix/dsnoop # default with dmix/dsnoop
@ -63,28 +62,24 @@ VIA686A.pcm.iec958.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems
hook_args [ hook_args [
{ {
name "IEC958 Playback AC97-SPSA" name "IEC958 Playback AC97-SPSA"
device 0
lock true lock true
preserve true preserve true
value 0 value 0
} }
{ {
name "IEC958 Playback Default" name "IEC958 Playback Default"
device 0
lock true lock true
preserve true preserve true
value [ $AES0 $AES1 $AES2 $AES3 ] value [ $AES0 $AES1 $AES2 $AES3 ]
} }
{ {
name "IEC958 Playback Switch" name "IEC958 Playback Switch"
device 0
lock true lock true
preserve true preserve true
value true value true

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

@ -11,7 +11,6 @@ VIA8233.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# default with softvol/dsnoop # default with softvol/dsnoop
@ -29,7 +28,6 @@ VIA8233.pcm.default {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
control { control {
name "PCM Playback Volume" name "PCM Playback Volume"
@ -65,7 +63,6 @@ VIA8233.pcm.surround40.0 {
hook_args [ hook_args [
{ {
name "Channel Mode" name "Channel Mode"
device 0
preserve true preserve true
value "4ch" value "4ch"
lock true lock true
@ -80,7 +77,6 @@ VIA8233.pcm.surround40.0 {
} }
{ {
name "Surround Down Mix" name "Surround Down Mix"
device 0
preserve true preserve true
value off value off
lock true lock true
@ -111,7 +107,6 @@ VIA8233.pcm.surround51.0 {
hook_args [ hook_args [
{ {
name "Channel Mode" name "Channel Mode"
device 0
preserve true preserve true
value "6ch" value "6ch"
lock true lock true
@ -132,7 +127,6 @@ VIA8233.pcm.surround51.0 {
} }
{ {
name "Surround Down Mix" name "Surround Down Mix"
device 0
preserve true preserve true
value off value off
lock true lock true
@ -140,7 +134,6 @@ VIA8233.pcm.surround51.0 {
} }
{ {
name "Center/LFE Down Mix" name "Center/LFE Down Mix"
device 0
preserve true preserve true
value off value off
lock true lock true
@ -173,7 +166,6 @@ VIA8233.pcm.iec958.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
subdevice 3 subdevice 3
} }
hooks.0 { hooks.0 {

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

@ -11,7 +11,6 @@ VIA8233A.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# default with dmix/dsnoop # default with dmix/dsnoop
@ -48,7 +47,6 @@ VIA8233A.pcm.surround40.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
channels 4 channels 4
} }
hooks.0 { hooks.0 {
@ -56,7 +54,6 @@ VIA8233A.pcm.surround40.0 {
hook_args [ hook_args [
{ {
name "Swap Surround Slot" name "Swap Surround Slot"
device 0
lock true lock true
preserve true preserve true
value false value false
@ -100,7 +97,6 @@ VIA8233A.pcm.surround51.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
channels 6 channels 6
} }
hooks.0 { hooks.0 {
@ -108,7 +104,6 @@ VIA8233A.pcm.surround51.0 {
hook_args [ hook_args [
{ {
name "Swap Surround Slot" name "Swap Surround Slot"
device 0
lock true lock true
preserve true preserve true
value true value true
@ -182,28 +177,24 @@ VIA8233A.pcm.iec958.0 {
hook_args [ hook_args [
{ {
name "IEC958 Playback AC97-SPSA" name "IEC958 Playback AC97-SPSA"
device 0
lock true lock true
preserve true preserve true
value 3 value 3
} }
{ {
name "IEC958 Playback Default" name "IEC958 Playback Default"
device 0
lock true lock true
preserve true preserve true
value [ $AES0 $AES1 $AES2 $AES3 ] value [ $AES0 $AES1 $AES2 $AES3 ]
} }
{ {
name "IEC958 Playback Switch" name "IEC958 Playback Switch"
device 0
lock true lock true
preserve true preserve true
value true value true
} }
{ {
name "IEC958 Output Switch" name "IEC958 Output Switch"
device 0
lock true lock true
preserve true preserve true
value true value true

8
src/conf/cards/VIA8237.conf
View file

@ -11,7 +11,6 @@ VIA8237.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
# default with softvol/dsnoop # default with softvol/dsnoop
@ -29,7 +28,6 @@ VIA8237.pcm.default {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
control { control {
name "PCM Playback Volume" name "PCM Playback Volume"
@ -65,7 +63,6 @@ VIA8237.pcm.surround40.0 {
hook_args [ hook_args [
{ {
name "Channel Mode" name "Channel Mode"
device 0
preserve true preserve true
value "4ch" value "4ch"
lock true lock true
@ -73,7 +70,6 @@ VIA8237.pcm.surround40.0 {
} }
{ {
name "Surround Down Mix" name "Surround Down Mix"
device 0
preserve true preserve true
value off value off
lock true lock true
@ -112,7 +108,6 @@ VIA8237.pcm.surround51.0 {
hook_args [ hook_args [
{ {
name "Channel Mode" name "Channel Mode"
device 0
preserve true preserve true
value "6ch" value "6ch"
lock true lock true
@ -120,7 +115,6 @@ VIA8237.pcm.surround51.0 {
} }
{ {
name "Surround Down Mix" name "Surround Down Mix"
device 0
preserve true preserve true
value off value off
lock true lock true
@ -128,7 +122,6 @@ VIA8237.pcm.surround51.0 {
} }
{ {
name "Center/LFE Down Mix" name "Center/LFE Down Mix"
device 0
preserve true preserve true
value off value off
lock true lock true
@ -163,7 +156,6 @@ VIA8237.pcm.iec958.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
subdevice 3 subdevice 3
} }
hooks.0 { hooks.0 {

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

@ -11,7 +11,6 @@ VX222.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
<confdir:pcm/iec958.conf> <confdir:pcm/iec958.conf>
@ -37,7 +36,6 @@ VX222.pcm.iec958.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems

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

@ -11,7 +11,6 @@ VXPocket.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
<confdir:pcm/iec958.conf> <confdir:pcm/iec958.conf>
@ -37,7 +36,6 @@ VXPocket.pcm.iec958.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems

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

@ -11,7 +11,6 @@ VXPocket440.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
<confdir:pcm/rear.conf> <confdir:pcm/rear.conf>
@ -86,7 +85,6 @@ VXPocket440.pcm.iec958.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 0
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems

1
src/conf/cards/YMF744.conf
View file

@ -11,7 +11,6 @@ YMF744.pcm.front.0 {
} }
type hw type hw
card $CARD card $CARD
device 0
} }
<confdir:pcm/rear.conf> <confdir:pcm/rear.conf>

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

@ -53,5 +53,6 @@ pcm.!center_lfe {
name defaults.namehint.basic name defaults.namehint.basic
} }
description "Center and Subwoofer speakers" description "Center and Subwoofer speakers"
device $DEV
} }
} }

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

@ -18,25 +18,40 @@ pcm.!default {
} }
} }
} }
# use card-specific definition if exists type empty
@func refer slave.pcm {
name { # use card-specific definition if exists
@func concat @func refer
strings [ name {
"cards." @func concat
{ strings [
@func card_driver "cards."
{
@func card_driver
card $CARD
}
".pcm.default1:CARD=" $CARD
]
}
default {
# use plughw as default
type plug
slave.pcm {
type hw
card $CARD card $CARD
} }
".pcm.default:CARD=" $CARD hint.device 0
] }
} }
default { hint {
# use plughw as default description "Default Audio Device"
type plug device_output {
slave.pcm { @func refer
type hw name defaults.pcm.dmix.device
card $CARD }
device_input {
@func refer
name defaults.pcm.dsnoop.device
} }
} }
} }

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

@ -53,5 +53,6 @@ pcm.!front {
name defaults.namehint.basic name defaults.namehint.basic
} }
description "Front speakers" description "Front speakers"
device $DEV
} }
} }

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

@ -78,5 +78,6 @@ pcm.!iec958 {
name defaults.namehint.basic name defaults.namehint.basic
} }
description "IEC958 (S/PDIF) Digital Audio Output" description "IEC958 (S/PDIF) Digital Audio Output"
device $DEV
} }
} }

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

@ -53,5 +53,6 @@ pcm.!rear {
name defaults.namehint.basic name defaults.namehint.basic
} }
description "Rear speakers" description "Rear speakers"
device $DEV
} }
} }

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

@ -53,5 +53,6 @@ pcm.!side {
name defaults.namehint.basic name defaults.namehint.basic
} }
description "Side speakers" description "Side speakers"
device $DEV
} }
} }

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

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

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

@ -59,5 +59,8 @@ pcm.!surround41 {
ttable.2.2 1 ttable.2.2 1
ttable.3.3 1 ttable.3.3 1
ttable.4.5 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
}
} }

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

@ -59,5 +59,8 @@ pcm.!surround50 {
ttable.2.2 1 ttable.2.2 1
ttable.3.3 1 ttable.3.3 1
ttable.4.4 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
}
} }

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

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

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

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

27
src/control/namehint.c
View file

@ -185,7 +185,7 @@ static char *get_dev_name(struct hint_list *list)
strcat(res, ", "); strcat(res, ", ");
strcat(res, str1); strcat(res, str1);
strcat(res, " {"); strcat(res, " {");
strcat(res, list->iface == SND_CTL_ELEM_IFACE_PCM ? "Capture" : "Input"); strcat(res, str2);
strcat(res, "}"); strcat(res, "}");
free(str1); free(str1);
return res; return res;
@ -205,7 +205,7 @@ static int try_config(struct hint_list *list,
const char *name) const char *name)
{ {
snd_lib_error_handler_t eh; snd_lib_error_handler_t eh;
snd_config_t *res = NULL, *cfg, *n; snd_config_t *res = NULL, *cfg, *cfg1, *n;
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
char *buf, *buf1 = NULL, *buf2; char *buf, *buf1 = NULL, *buf2;
const char *str; const char *str;
@ -253,11 +253,26 @@ static int try_config(struct hint_list *list,
} }
#endif #endif
cfg = res; cfg1 = res;
level = 0; level = 0;
__hint: __hint:
level++; level++;
if (snd_config_search(cfg, "hint", &cfg) >= 0) { if (snd_config_search(cfg1, "type", &cfg) >= 0 &&
snd_config_get_string(cfg, &str) >= 0 &&
strcmp(str, "hw") == 0) {
dev = 0;
list->device_input = -1;
list->device_output = -1;
if (snd_config_search(cfg1, "device", &cfg) >= 0) {
if (snd_config_get_integer(cfg, &dev) < 0) {
SNDERR("(%s) device must be an integer", buf);
err = -EINVAL;
goto __cleanup;
}
}
}
if (snd_config_search(cfg1, "hint", &cfg) >= 0) {
if (snd_config_get_type(cfg) != SND_CONFIG_TYPE_COMPOUND) { if (snd_config_get_type(cfg) != SND_CONFIG_TYPE_COMPOUND) {
SNDERR("hint (%s) must be a compound", buf); SNDERR("hint (%s) must be a compound", buf);
err = -EINVAL; err = -EINVAL;
@ -302,8 +317,8 @@ static int try_config(struct hint_list *list,
} }
} else if (level == 1 && !list->show_all) } else if (level == 1 && !list->show_all)
goto __skip_add; goto __skip_add;
if (snd_config_search(cfg, "slave", &cfg) >= 0 && if (snd_config_search(cfg1, "slave", &cfg) >= 0 &&
snd_config_search(cfg, base, &cfg) >= 0) snd_config_search(cfg, base, &cfg1) >= 0)
goto __hint; goto __hint;
snd_config_delete(res); snd_config_delete(res);
res = NULL; res = NULL;