Moving mixers to audio outputs

2 files changed, 25 insertions, 15 deletions

diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index 5feefc36..935bd9b2 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -157,18 +157,23 @@ Linear interpolator, very fast, poor quality.
 For an up-to-date list of available converters, please see the libsamplerate
 documentation (available online at <\fBhttp://www.mega-nerd.com/SRC/\fP>).
 .TP
-.B mixer_type <oss, alsa or software>
-This specifies which mixer to use.  The default depends on what audio output
-support mpd was built with.
+.B mixer_type <alsa, oss, software or hardware>
+This specifies which mixer to use.  The default is hardware and depends on
+what audio output support mpd was built with. Options alsa and oss are
+legacy and should not be used in new configs, but when set mixer_device
+and mixer_control will apply.
 .TP
 .B mixer_device <mixer dev>
 This specifies which mixer to use.  The default for oss is "/dev/mixer"; the
-default for alsa is "default".
+default for alsa is "default". This option is deprecated and should not be
+used.  Look at the mix_device option of corresponding output device instead.
 .TP
 .B mixer_control <mixer ctrl>
 This specifies which mixer control to use (sometimes referred to as the
 "device").  Examples of mixer controls are PCM, Line1, Master, etc.  An example
-for OSS is "Pcm", and an example for alsa is "PCM".
+for OSS is "Pcm", and an example for alsa is "PCM". This option is deprecated
+and should not be used. Look at the mix_control option of corresponding
+output device instead.
 .TP
 .B replaygain <album or track>
 If specified, mpd will adjust the volume of songs played using ReplayGain tags
@@ -276,6 +281,15 @@ 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 mix_device <mixer dev>
+This specifies which mixer to use.  The default for oss is "/dev/mixer"; the
+default for alsa is "default".
+.TP
+.B mix_control <mixer ctrl>
+This specifies which mixer control to use (sometimes referred to as the
+"device").  Examples of mixer controls are PCM, Line1, Master, etc.  An example
+for OSS is "Pcm", and an example for alsa is "PCM".
+.TP
 .B use_mmap <yes or no>
 Setting this allows you to use memory-mapped I/O.  Certain hardware setups may
 benefit from this, but most do not.  Most users do not need to set this.  The
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 2de2e05e..0b800423 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -162,6 +162,8 @@ log_file			"~/.mpd/log"
 #	name			"My ALSA Device"
 #	device			"hw:0,0"	# optional
 #	format			"44100:16:2"	# optional
+#	mix_device		"default"	# optional
+#	mix_control		"PCM"		# optional
 #}
 #
 # An example of an OSS output:
@@ -171,6 +173,8 @@ log_file			"~/.mpd/log"
 #	name			"My OSS Device"
 #	device			"/dev/dsp"	# optional
 #	format			"44100:16:2"	# optional
+#	mix_device		"/dev/mixer"	# optional
+#	mix_control		"PCM"		# optional
 #}
 #
 # An example of a shout output (for streaming to Icecast):
@@ -232,17 +236,9 @@ log_file			"~/.mpd/log"
 # specified it may be autodetected at startup, depending on the dependencies
 # which were compiled into the server.
 #
-# An example for controlling an ALSA mixer:
+# An example for controlling an ALSA or OSS mixer:
 #
-#mixer_type			"alsa"
-#mixer_device			"default"
-#mixer_control			"PCM"
-#
-# An example for controlling an OSS mixer:
-#
-#mixer_type			"oss"
-#mixer_device			"/dev/mixer"
-#mixer_control			"PCM"
+#mixer_type			"hardware"
 #
 # This example is a general volume control mixer, it is used to adjust the 
 # volume of the audio sent to the audio output, and will work with all outputs.