aboutsummaryrefslogtreecommitdiffstats
path: root/doc/mpd.conf.5
diff options
context:
space:
mode:
Diffstat (limited to 'doc/mpd.conf.5')
-rw-r--r--doc/mpd.conf.524
1 files changed, 19 insertions, 5 deletions
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index 5feefc36e..935bd9b2f 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -157,18 +157,23 @@ Linear interpolator, very fast, poor quality.
For an up-to-date list of available converters, please see the libsamplerate
documentation (available online at <\fBhttp://www.mega-nerd.com/SRC/\fP>).
.TP
-.B mixer_type <oss, alsa or software>
-This specifies which mixer to use. The default depends on what audio output
-support mpd was built with.
+.B mixer_type <alsa, oss, software or hardware>
+This specifies which mixer to use. The default is hardware and depends on
+what audio output support mpd was built with. Options alsa and oss are
+legacy and should not be used in new configs, but when set mixer_device
+and mixer_control will apply.
.TP
.B mixer_device <mixer dev>
This specifies which mixer to use. The default for oss is "/dev/mixer"; the
-default for alsa is "default".
+default for alsa is "default". This option is deprecated and should not be
+used. Look at the mix_device option of corresponding output device instead.
.TP
.B mixer_control <mixer ctrl>
This specifies which mixer control to use (sometimes referred to as the
"device"). Examples of mixer controls are PCM, Line1, Master, etc. An example
-for OSS is "Pcm", and an example for alsa is "PCM".
+for OSS is "Pcm", and an example for alsa is "PCM". This option is deprecated
+and should not be used. Look at the mix_control option of corresponding
+output device instead.
.TP
.B replaygain <album or track>
If specified, mpd will adjust the volume of songs played using ReplayGain tags
@@ -276,6 +281,15 @@ whatever audio format is passed to the audio output.
.B device <dev>
This specifies the device to use for audio output. The default is "default".
.TP
+.B mix_device <mixer dev>
+This specifies which mixer to use. The default for oss is "/dev/mixer"; the
+default for alsa is "default".
+.TP
+.B mix_control <mixer ctrl>
+This specifies which mixer control to use (sometimes referred to as the
+"device"). Examples of mixer controls are PCM, Line1, Master, etc. An example
+for OSS is "Pcm", and an example for alsa is "PCM".
+.TP
.B use_mmap <yes or no>
Setting this allows you to use memory-mapped I/O. Certain hardware setups may
benefit from this, but most do not. Most users do not need to set this. The