aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-02 18:16:33 +0100
committerMax Kellermann <max@duempel.org>2014-12-02 18:20:44 +0100
commit0debba0f6e35d88ad17734fda2605e4f97f19820 (patch)
tree5a3821b5f3e4ad7145ad3717dad8506ad5dd8ca4 /doc
parentf2bd2c318c810645b4e3c7518d695d6d4b1c06a7 (diff)
downloadmpd-0debba0f6e35d88ad17734fda2605e4f97f19820.tar.gz
mpd-0debba0f6e35d88ad17734fda2605e4f97f19820.tar.xz
mpd-0debba0f6e35d88ad17734fda2605e4f97f19820.zip
mixer/null: new mixer plugin
Diffstat (limited to 'doc')
-rw-r--r--doc/user.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/user.xml b/doc/user.xml
index bc43a4167..920454377 100644
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -572,7 +572,7 @@ systemctl start mpd.socket</programlisting>
<row>
<entry>
<varname>mixer_type</varname>
- <parameter>hardware|software|none</parameter>
+ <parameter>hardware|software|null|none</parameter>
</entry>
<entry>
Specifies which mixer should be used for this audio
@@ -580,7 +580,9 @@ systemctl start mpd.socket</programlisting>
linkend="alsa_output">ALSA</link>, <link
linkend="oss_output">OSS</link> and <link
linkend="pulse_output">PulseAudio</link>), the
- software mixer or no mixer
+ software mixer, the "null" mixer
+ (<parameter>null</parameter>; allows setting the
+ volume, but with no effect) or no mixer
(<parameter>none</parameter>). By default, the
hardware mixer is used for devices which support it,
and none for the others.