[Pkg-mpd-commits] [SCM] Git repository for pkg-mpd branch, master, updated. debian/0.17.3-1-13-g6e3cca2

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 604d367b74d7570e684f5c578a4255789e6a7024
Author: Florian Schlichting <fsfs at debian.org>
Date:   Tue Apr 9 00:06:46 2013 +0200

    update mpd.conf with new options, ship upstreams version in examples

diff --git a/debian/mpd.conf b/debian/mpd.conf
index 606c854..1439167 100644
--- a/debian/mpd.conf
+++ b/debian/mpd.conf
@@ -283,6 +283,25 @@ audio_output {
 #	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 {
@@ -323,8 +342,11 @@ audio_output {
 # 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"
 #
@@ -333,6 +355,20 @@ audio_output {
 #
 #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.
diff --git a/debian/mpd.examples b/debian/mpd.examples
index 21aee7c..cfec328 100644
--- a/debian/mpd.examples
+++ b/debian/mpd.examples
@@ -1,2 +1,2 @@
-debian/mpd.conf
+doc/mpdconf.example
 debian/mpd.desktop

-- 
Git repository for pkg-mpd