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

add snd_device_name_hint() function and initial implementation

Browse source 
- add snd_device_name_hint() and snd_device_name_free_hint() functions
- add snd_ctl_iface_conf_name() functions
- do not accept parameters for the plugin definition without @args section
- add defaults.pcm.dmix.card/device and dsnoop.card/device definitions
- add hints for HDA-Intel.conf, pcm/dmix.conf, pcm/dsnoop.conf and alsa.conf
- add test/namehint test utility
- doxygen related cleanups
This commit is contained in:
Jaroslav Kysela 2006-10-11 13:18:57 +02:00
parent b223fbba23
commit 13fdc41785
19 changed files with 646 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/conf/alsa.conf
View file

@ -57,9 +57,13 @@ defaults.pcm.nonblock 1
defaults.pcm.ipc_key 5678293
defaults.pcm.ipc_gid audio
defaults.pcm.ipc_perm 0660
defaults.pcm.dmix_max_periods 0
defaults.pcm.dmix_rate 48000
defaults.pcm.dmix_format S16_LE
defaults.pcm.dmix.max_periods 0
defaults.pcm.dmix.rate 48000
defaults.pcm.dmix.format S16_LE
defaults.pcm.dmix.card defaults.pcm.card
defaults.pcm.dmix.device defaults.pcm.device
defaults.pcm.dsnoop.card defaults.pcm.card
defaults.pcm.dsnoop.device defaults.pcm.device
defaults.pcm.front.card defaults.pcm.card
defaults.pcm.front.device defaults.pcm.device
defaults.pcm.rear.card defaults.pcm.card
@ -137,6 +141,7 @@ pcm.hw {
card $CARD
device $DEV
subdevice $SUBDEV
hint 0
}
pcm.plughw {
@ -182,6 +187,7 @@ pcm.plughw {
device $DEV
subdevice $SUBDEV
}
hint 0
}
pcm.plug {
@ -240,6 +246,7 @@ pcm.file {
}
pcm.null {
hint.description "Discard all samples (playback) or generate zero samples (capture)"
type null
}
@ -357,6 +364,10 @@ rawmidi.hw {
card $CARD
device $DEV
subdevice $SUBDEV
hint {
description "Direct rawmidi driver device"
device $DEV
}
}
rawmidi.default {
@ -548,4 +559,5 @@ timer.default {
@func refer
name defaults.timer.subdevice
}
hint.description "Default direct hardware timer device"
}

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

@ -19,4 +19,5 @@ ATIIXP-MODEM.pcm.modem.0 {
slave.format S16_LE
ttable.0.1 1
ttable.1.0 0
hint 0
}

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

@ -19,6 +19,10 @@ HDA-Intel.pcm.front.0 {
name "PCM Playback Volume"
card $CARD
}
hint {
description "Front speakers and multichannel output"
device 0
}
}
# default with dmix+softvol & dsnoop
@ -49,6 +53,17 @@ HDA-Intel.pcm.default {
strings [ "dsnoop:" $CARD ]
}
}
hint {
description "Default dmix+softvol + dsnoop device"
device_output {
@func refer
name defaults.pcm.dmix.device
}
device_input {
@func refer
name defaults.pcm.dsnoop.device
}
}
}
<confdir:pcm/surround40.conf>
@ -125,6 +140,10 @@ HDA-Intel.pcm.iec958.0 {
]
}
}
hint {
description "IEC958 (S/PDIF) Output"
device 1
}
}
<confdir:pcm/modem.conf>
@ -137,4 +156,5 @@ HDA-Intel.pcm.modem.0 {
type hw
card $CARD
device 6
hint 0
}

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

@ -12,4 +12,5 @@ ICH-MODEM.pcm.modem.0 {
type hw
card $CARD
device 0
hint 0
}

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

@ -6,11 +6,17 @@ pcm.!dmix {
@args [ CARD DEV SUBDEV FORMAT RATE ]
@args.CARD {
type string
default 0
default {
@func refer
name defaults.pcm.dmix.card
}
}
@args.DEV {
type string
default 0
default {
@func refer
name defaults.pcm.dmix.device
}
}
@args.SUBDEV {
type string
@ -20,14 +26,14 @@ pcm.!dmix {
type string
default {
@func refer
name defaults.pcm.dmix_format
name defaults.pcm.dmix.format
}
}
@args.RATE {
type integer
default {
@func refer
name defaults.pcm.dmix_rate
name defaults.pcm.dmix.rate
}
}
type dmix
@ -98,4 +104,8 @@ pcm.!dmix {
default 16
}
}
hint {
description "Direct sample mixing device"
device $DEV
}
}

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

@ -6,11 +6,17 @@ pcm.!dsnoop {
@args [ CARD DEV SUBDEV FORMAT RATE ]
@args.CARD {
type string
default 0
default {
@func refer
name defaults.pcm.dsnoop.card
}
}
@args.DEV {
type string
default 0
default {
@func refer
name defaults.pcm.dsnoop.device
}
}
@args.SUBDEV {
type string
@ -20,14 +26,14 @@ pcm.!dsnoop {
type string
default {
@func refer
name defaults.pcm.dmix_format
name defaults.pcm.dmix.format
}
}
@args.RATE {
type integer
default {
@func refer
name defaults.pcm.dmix_rate
name defaults.pcm.dmix.rate
}
}
type dsnoop
@ -98,4 +104,8 @@ pcm.!dsnoop {
default 16
}
}
hint {
description "Direct sample snooping device"
device $DEV
}
}

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

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