diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5 index dba94de5a..58d951b53 100644 --- a/doc/mpd.conf.5 +++ b/doc/mpd.conf.5 @@ -163,57 +163,12 @@ Specifies how replay gain is applied. The default is "software", which uses an internal software volume control. "mixer" uses the configured (hardware) mixer control. "none" disables replay gain on this audio output. -.SH OPTIONAL ALSA OUTPUT PARAMETERS -.TP -.B device -This specifies the device to use for audio output. The default is "default". .TP .B mixer_type Specifies which mixer should be used for this audio output: the hardware mixer (available for ALSA, OSS and PulseAudio), the software mixer or no mixer ("none"). By default, the hardware mixer is used for devices which support it, and none for the others. -.TP -.B mixer_device -This specifies which mixer to use. The default is "default". To use -the second sound card in a system, use "hw:1". -.TP -.B mixer_control -This specifies which mixer control to use (sometimes referred to as -the "device"). The default is "PCM". Use "amixer scontrols" to see -the list of possible controls. -.TP -.B mixer_index -A number identifying the index of the named mixer control. This is -probably only useful if your alsa device has more than one -identically\-named mixer control. The default is "0". Use "amixer -scontrols" to see the list of controls with their indexes. -.TP -.B auto_resample -Setting this to "no" disables ALSA's software resampling, if the -hardware does not support a specific sample rate. This lets MPD do -the resampling. "yes" is the default and allows ALSA to resample. -.TP -.B auto_channels -Setting this to "no" disables ALSA's channel conversion, if the -hardware does not support a specific number of channels. Default: "yes". -.TP -.B auto_format -Setting this to "no" disables ALSA's sample format conversion, if the -hardware does not support a specific sample format. Default: "yes". -.TP -.B buffer_time