From 0275690b5cd133f992e9e34d6c76eb134aef26bd Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 6 Jul 2009 22:00:50 +0200
Subject: output: use the software mixer plugin

Do all the software volume stuff inside each output thread, not in the
player thread.  This allows one software mixer per output device, and
also allows the user to configure the mixer type (hardware or
software) for each audio output.

This moves the global "mixer_type" setting into the "audio_output"
section, deprecating the "mixer_enabled" flag.
---
 doc/user.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'doc/user.xml')

diff --git a/doc/user.xml b/doc/user.xml
index 787f3e3bd..22da500b1 100644
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -289,13 +289,15 @@ cd mpd-0.14.2</programlisting>
             </row>
             <row>
               <entry>
-                <varname>mixer_enabled</varname>
-                <parameter>yes|no</parameter>
+                <varname>mixer_type</varname>
+                <parameter>hardware|software|none</parameter>
               </entry>
               <entry>
-                Specifies whether the hardware mixer of this audio
-                output should be used.  By default, all hardware
-                mixers are enabled if available.
+                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.
               </entry>
             </row>
           </tbody>
-- 
cgit v1.2.3