From 0275690b5cd133f992e9e34d6c76eb134aef26bd Mon Sep 17 00:00:00 2001 From: Max Kellermann 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/mpd.conf.5 | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc/mpd.conf.5') 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 This specifies the device to use for audio output. The default is "default". .TP +.B mixer_type +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 This specifies which mixer to use. The default is "default". To use the second sound card in a system, use "hw:1". -- cgit v1.2.3