diff options
| author | Max Kellermann <max@duempel.org> | 2009-07-06 22:00:50 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-07-06 22:00:50 +0200 |
| commit | 0275690b5cd133f992e9e34d6c76eb134aef26bd (patch) | |
| tree | 3ce67839d522420ff7b99224cdc8892c86395036 /doc/mpd.conf.5 | |
| parent | da8095db546544bb9fe3a455ef5742bfef9c2f4f (diff) | |
| download | mpd-0275690b5cd133f992e9e34d6c76eb134aef26bd.tar.gz mpd-0275690b5cd133f992e9e34d6c76eb134aef26bd.tar.xz mpd-0275690b5cd133f992e9e34d6c76eb134aef26bd.zip | |
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.
Diffstat (limited to '')
| -rw-r--r-- | doc/mpd.conf.5 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5 index 7bf3a3f75..c8e632478 100644 --- a/doc/mpd.conf.5 +++ b/doc/mpd.conf.5 @@ -285,6 +285,12 @@ 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 mixer_type <hardware, software or none> +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. +.TP .B mixer_device <mixer dev> This specifies which mixer to use. The default is "default". To use the second sound card in a system, use "hw:1". |