aboutsummaryrefslogtreecommitdiffstats
path: root/doc/mpdconf.example
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-01-01 18:36:47 +0100
committerMax Kellermann <max@duempel.org>2009-01-01 18:36:47 +0100
commitecb20c5f7e728693bcb67981fdde44832f1ed028 (patch)
tree89a3b2d53b51ccf7110eee8608b624b1e3074cf3 /doc/mpdconf.example
parent65f037eb323c5229e6655da4f562f7a98fd30eee (diff)
downloadmpd-ecb20c5f7e728693bcb67981fdde44832f1ed028.tar.gz
mpd-ecb20c5f7e728693bcb67981fdde44832f1ed028.tar.xz
mpd-ecb20c5f7e728693bcb67981fdde44832f1ed028.zip
mixer: renamed mix_* options to mixer_*
There is no reason to use the shortcut "mix" instead of "mixer".
Diffstat (limited to '')
-rw-r--r--doc/mpdconf.example8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 0b8004237..ba9a74ef6 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -162,8 +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
+# mixer_device "default" # optional
+# mixer_control "PCM" # optional
#}
#
# An example of an OSS output:
@@ -173,8 +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
+# mixer_device "/dev/mixer" # optional
+# mixer_control "PCM" # optional
#}
#
# An example of a shout output (for streaming to Icecast):