[Pkg-mpd-commits] [SCM] Git repository for pkg-mpd branch, master, updated. debian/0.17.1-1-22-g38ab336

Fri Feb 22 00:22:30 UTC 2013

The following commit has been merged in the master branch:
commit 5611f23b32b1083adcbb296f26c22f068dcfc8ae
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Fri Feb 22 00:35:05 2013 +0100

    update provided mpd.conf from doc/mpdconf.example, adding httpd.bind_to_address in the process (closes: #664204)

diff --git a/debian/mpd.conf b/debian/mpd.conf
index f2bc9d7..606c854 100644
--- a/debian/mpd.conf
+++ b/debian/mpd.conf
@@ -104,14 +104,19 @@ bind_to_address		"localhost"
 #
 #gapless_mp3_playback			"yes"
 #
+# Setting "restore_paused" to "yes" puts MPD into pause mode instead
+# of starting playback after startup.
+#
+#restore_paused "no"
+#
 # This setting enables MPD to create playlists in a format usable by other
 # music players.
 #
 #save_absolute_paths_in_playlists	"no"
 #
 # This setting defines a list of tag types that will be extracted during the 
-# audio file discovery process. Optionally, 'comment' can be added to this
-# list.
+# audio file discovery process. The complete list of possible values can be
+# found in the mpd.conf man page.
 #
 #metadata_to_use	"artist,album,title,track,name,genre,date,composer,performer,disc"
 #
@@ -200,11 +205,12 @@ input {
 audio_output {
 	type		"alsa"
 	name		"My ALSA Device"
-#	device		"hw:0,0"	 optional
-#	format		"44100:16:2"	 optional
-#	mixer_device	"default"	 optional
-#	mixer_control	"PCM"		 optional
-#	mixer_index	"0"		 optional
+#	device		"hw:0,0"	# optional
+#	format		"44100:16:2"	# optional
+#	mixer_type      "hardware"      # optional
+#	mixer_device	"default"	# optional
+#	mixer_control	"PCM"		# optional
+#	mixer_index	"0"		# optional
 }
 #
 # An example of an OSS output:
@@ -214,6 +220,7 @@ audio_output {
 #	name		"My OSS Device"
 #	device		"/dev/dsp"	# optional
 #	format		"44100:16:2"	# optional
+#	mixer_type      "hardware"      # optional
 #	mixer_device	"/dev/mixer"	# optional
 #	mixer_control	"PCM"		# optional
 #}
@@ -234,9 +241,11 @@ audio_output {
 #	protocol	"icecast2"		# optional
 #	user		"source"		# optional
 #	description	"My Stream Description"	# optional
+#	url             "http://example.com"    # optional
 #	genre		"jazz"			# optional
 #	public		"no"			# optional
 #	timeout		"2"			# optional
+#	mixer_type      "software"              # optional
 #}
 #
 # An example of a recorder output:
@@ -258,9 +267,11 @@ audio_output {
 #	name		"My HTTP Stream"
 #	encoder		"vorbis"		# optional, vorbis or lame
 #	port		"8000"
+#	bind_to_address "0.0.0.0"               # optional, IPv4 or IPv6
 #	quality		"5.0"			# do not define if bitrate is defined
 #	bitrate		"128"			# do not define if quality is defined
 #	format		"44100:16:1"
+#	max_clients     "0"                     # optional 0=no limit
 #}
 #
 # An example of a pulseaudio output (streaming to a remote pulseaudio server)
@@ -290,6 +301,7 @@ audio_output {
 #audio_output {
 #	type		"null"
 #	name		"My Null Output"
+#	mixer_type      "none"                  # optional
 #}
 #
 # This setting will change all decoded audio to be converted to the specified
@@ -308,38 +320,11 @@ audio_output {
 ###############################################################################
 
 
-# Volume control mixer ########################################################
-#
-# These are the global volume control settings. By default, this setting will
-# be detected to the available audio output device, with preference going to 
-# hardware mixing. Hardware and software mixers for individual audio_output
-# sections cannot yet be mixed.
-#
-# An example for controlling an ALSA, OSS or Pulseaudio mixer; If this
-# setting is used other sound applications will be affected by the volume
-# being controlled by MPD.
-#
-#mixer_type			"hardware"
-#
-# An example for controlling all mixers through software. This will control
-# all controls, even if the mixer is not supported by the device and will not
-# affect any other sound producing applications.
-#
-#mixer_type			"software"
-#
-# This example will not allow MPD to touch the mixer at all and will disable
-# all volume controls.
-#
-#mixer_type			"disabled"
-#
-###############################################################################
-
-
 # Normalization automatic volume adjustments ##################################
 #
 # This setting specifies the type of ReplayGain to use. This setting can have
-# the argument "album" or "track". See <http://www.replaygain.org> for more
-# details. This setting is disabled by default.
+# the argument "off", "album" or "track". See <http://www.replaygain.org>
+# for more details. This setting is off by default.
 #
 #replaygain			"album"
 #
@@ -389,11 +374,40 @@ audio_output {
 ###############################################################################
 
 
+# Client TCP keep alive #######################################################
+#
+# For clients connected by TCP on supported platforms.
+# Allows detection of dangling connections due to clients disappearing from
+# the network without closing their connections.
+#
+# This is not usually necessary but can be useful in cases such as wifi connectected
+# clients that go in and out of network range or turn off wifi without closing their
+# connections. Combined with low max_connections this can soon cause clients to not
+# be able to connect.
+#
+#
+# Enable tcp keepalive on new client connections (default is "no")
+#
+#tcp_keep_alive "no"
+#
+# Time in seconds since the last communication on the connection and before
+# the keepalive probing is started. (default is 7200 seconds)
+#tcp_keep_alive_idle "7200"
+#
+# Interval in seconds between keepalive probes, once a probe started.
+# (default is 75 seconds)
+#tcp_keep_alive_interval "75"
+#
+# Number of failed probes before the connection is pronounced dead and
+# the connection is closed. (default is 9 times)
+#tcp_keep_alive_count "9"
+#
+###############################################################################
+
 # Character Encoding ##########################################################
 #
 # If file or directory names do not display correctly for your locale then you 
-# may need to modify this setting. After modification of this setting mpd 
-# --create-db must be run to change the database.
+# may need to modify this setting.
 #
 filesystem_charset		"UTF-8"
 #
@@ -402,6 +416,8 @@ filesystem_charset		"UTF-8"
 id3v1_encoding			"UTF-8"
 #
 ###############################################################################
+
+
 # SIDPlay decoder #############################################################
 #
 # songlength_database:

-- 
Git repository for pkg-mpd

