oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

clean up documentation of mixer options.

Browse Source
This commit is contained in:
Daniel Kahn Gillmor
2009-04-28 17:21:26 +02:00
committed by Max Kellermann
parent fd81e7e3b6
commit fd09a3cf1f
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
doc/mpd.conf.5
View File

@@ -175,16 +175,17 @@ legacy and should not be used in new configs, but when set mixer_device
and mixer_control will apply. and mixer_control will apply.
.TP .TP
.B mixer_device <mixer dev> .B mixer_device <mixer dev>
This specifies which mixer to use. The default for oss is "/dev/mixer"; the This specifies which mixer to use. The default for oss is
default for alsa is "default". This option is deprecated and should not be "/dev/mixer"; the default for alsa is "default". This global option is
used. Look at the mixer_device option of corresponding output device instead. deprecated and should not be used. Look at the mixer_device option of
corresponding output device instead.
.TP .TP
.B mixer_control <mixer ctrl> .B mixer_control <mixer ctrl>
This specifies which mixer control to use (sometimes referred to as the This specifies which mixer control to use (sometimes referred to as
"device"). Examples of mixer controls are PCM, Line1, Master, etc. An example the "device"). Examples of mixer controls are PCM, Line1, Master,
for OSS is "Pcm", and an example for alsa is "PCM". This option is deprecated etc. An example for OSS is "Pcm", and an example for alsa is
and should not be used. Look at the mixer_control option of corresponding "PCM". This global option is deprecated and should not be used. Look
output device instead. at the mixer_control option of corresponding output device instead.
.TP .TP
.B replaygain <album or track> .B replaygain <album or track>
If specified, mpd will adjust the volume of songs played using ReplayGain tags If specified, mpd will adjust the volume of songs played using ReplayGain tags
@@ -285,19 +286,19 @@ whatever audio format is passed to the audio output.
This specifies the device to use for audio output. The default is "default". This specifies the device to use for audio output. The default is "default".
.TP .TP
.B mixer_device <mixer dev> .B mixer_device <mixer dev>
This specifies which mixer to use. The default for oss is "/dev/mixer"; the This specifies which mixer to use. The default is "default". To use
default for alsa is "default". the second sound card in a system, use "hw:1".
.TP .TP
.B mixer_control <mixer ctrl> .B mixer_control <mixer ctrl>
This specifies which mixer control to use (sometimes referred to as the This specifies which mixer control to use (sometimes referred to as
"device"). Examples of mixer controls are PCM, Line1, Master, etc. An example the "device"). The default is "PCM". Use "amixer scontrols" to see
for OSS is "Pcm", and an example for alsa is "PCM". the list of possible controls.
.TP .TP
.B mixer_index <mixer index> .B mixer_index <mixer index>
A number identifying the index of the named mixer control. This is A number identifying the index of the named mixer control. This is
probably only useful if your alsa device has more than one probably only useful if your alsa device has more than one
identically\-named mixer control. The default is "0". (Use "amixer identically\-named mixer control. The default is "0". Use "amixer
scontrols" to see the list of controls with their indexes) scontrols" to see the list of controls with their indexes.
.TP .TP
.B use_mmap <yes or no> .B use_mmap <yes or no>
Setting this allows you to use memory-mapped I/O. Certain hardware setups may Setting this allows you to use memory-mapped I/O. Certain hardware setups may
@@ -333,6 +334,13 @@ or 5804 microseconds for CD-quality audio.
.TP .TP
.B device <dev> .B device <dev>
This specifies the device to use for audio output. The default is "/dev/dsp". This specifies the device to use for audio output. The default is "/dev/dsp".
.TP
.B mixer_device <mixer dev>
This specifies which mixer to use. The default is "/dev/mixer".
.TP
.B mixer_control <mixer ctrl>
This specifies which mixer control to use (sometimes referred to as the
"device"). The default is to use the main PCM mixer. An example is "Pcm".
.SH OPTIONAL PULSE OUTPUT PARAMETERS .SH OPTIONAL PULSE OUTPUT PARAMETERS
.TP .TP
.B server <server list> .B server <server list>