aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-16 20:05:26 +0100
committerMax Kellermann <max@duempel.org>2013-01-16 20:05:26 +0100
commit74500eaccac3fd906489a93e969b67440ae41f5c (patch)
tree05bad33463d15b534c9120ff9dc70381aed15558 /doc
parentb7cf279d6da121d0bb0b274ab9581b697717b5a7 (diff)
parent1105e61f292fd61a6316a4b83439dbaa29c102fd (diff)
downloadmpd-74500eaccac3fd906489a93e969b67440ae41f5c.tar.gz
mpd-74500eaccac3fd906489a93e969b67440ae41f5c.tar.xz
mpd-74500eaccac3fd906489a93e969b67440ae41f5c.zip
Merge branch 'v0.17.x'
Diffstat (limited to 'doc')
-rw-r--r--doc/mpdconf.example40
1 files changed, 38 insertions, 2 deletions
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 8cae72e94..390d26beb 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -281,6 +281,25 @@ input {
## sink "remote_server_sink" # optional
#}
#
+# An example of a winmm output (Windows multimedia API).
+#
+#audio_output {
+# type "winmm"
+# name "My WinMM output"
+## device "Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
+# or
+## device "0" # optional
+## mixer_type "hardware" # optional
+#}
+#
+# An example of an openal output.
+#
+#audio_output {
+# type "openal"
+# name "My OpenAL output"
+## device "Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
+#}
+#
## Example "pipe" output:
#
#audio_output {
@@ -321,8 +340,11 @@ input {
# Normalization automatic volume adjustments ##################################
#
# This setting specifies the type of ReplayGain to use. This setting can have
-# the argument "off", "album" or "track". See <http://www.replaygain.org>
-# for more details. This setting is off by default.
+# the argument "off", "album", "track" or "auto". "auto" is a special mode that
+# chooses between "track" and "album" depending on the current state of
+# random playback. If random playback is enabled then "track" mode is used.
+# See <http://www.replaygain.org> for more details about ReplayGain.
+# This setting is off by default.
#
#replaygain "album"
#
@@ -331,6 +353,20 @@ input {
#
#replaygain_preamp "0"
#
+# This setting sets the pre-amp used for files that do NOT have ReplayGain tags.
+# By default this setting is disabled.
+#
+#replaygain_missing_preamp "0"
+#
+# This setting enables or disables ReplayGain limiting.
+# MPD calculates actual amplification based on the ReplayGain tags
+# and replaygain_preamp / replaygain_missing_preamp setting.
+# If replaygain_limit is enabled MPD will never amplify audio signal
+# above its original level. If replaygain_limit is disabled such amplification
+# might occur. By default this setting is enabled.
+#
+#replaygain_limit "yes"
+#
# This setting enables on-the-fly normalization volume adjustment. This will
# result in the volume of all playing audio to be adjusted so the output has
# equal "loudness". This setting is disabled by default.