From 0debba0f6e35d88ad17734fda2605e4f97f19820 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 2 Dec 2014 18:16:33 +0100
Subject: mixer/null: new mixer plugin

---
 doc/user.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'doc')

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.
-- 
cgit v1.2.3