aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--doc/mpd.conf.52
-rw-r--r--doc/mpdconf.example4
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index e375de195..592398a10 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -163,7 +163,7 @@ 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 <alsa, oss, software or hardware>
+.B mixer_type <alsa, oss, software, hardware or disabled>
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
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index ba9a74ef6..5b19c028c 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -245,6 +245,10 @@ log_file "~/.mpd/log"
#
#mixer_type "software"
#
+# This example will not allow MPD to touch the mixer at all.
+#
+#mixer_type "disabled"
+#
###############################################################################