aboutsummaryrefslogtreecommitdiffstats
path: root/doc/mpdconf.example
diff options
context:
space:
mode:
Diffstat (limited to 'doc/mpdconf.example')
-rw-r--r--doc/mpdconf.example16
1 files changed, 6 insertions, 10 deletions
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 2de2e05e5..0b8004237 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.