[Pkg-mpd-commits] [pkg-mpd] 01/01: Update mpd.conf according to the upstream mpdconf.example, adding a note to the pulseaudio output section

[Florian Schlichting]

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository pkg-mpd.

commit 3cbbb2e06b6bdcd55f0de1fc321857e1df2c5a3d
Author: Florian Schlichting <fsfs at debian.org>
Date:   Thu Sep 11 23:48:33 2014 +0200

    Update mpd.conf according to the upstream mpdconf.example, adding a note to the pulseaudio output section
---
 debian/mpd.conf | 53 +++++++++++++++--------------------------------------
 1 file changed, 15 insertions(+), 38 deletions(-)

diff --git a/debian/mpd.conf b/debian/mpd.conf
index 532f3a3..816f691 100644
--- a/debian/mpd.conf
+++ b/debian/mpd.conf
@@ -1,5 +1,6 @@
-# An example configuration file for MPD
-# See the mpd.conf man page for a more detailed description of each parameter.
+# An example configuration file for MPD.
+# Read the user manual for documentation: http://www.musicpd.org/doc/user/
+# or /usr/share/doc/mpd/user-manual.html
 
 
 # Files and directories #######################################################
@@ -117,7 +118,6 @@ bind_to_address		"localhost"
 # This setting defines a list of tag types that will be extracted during the 
 # 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"
 #
 # This setting enables automatic update of MPD's database when files in 
@@ -177,6 +177,15 @@ bind_to_address		"localhost"
 ###############################################################################
 
 
+# Database #######################################################################
+#
+
+#database {
+#       plugin "proxy"
+#       host "other.mpd.host"
+#       port "6600"
+#}
+
 # Input #######################################################################
 #
 
@@ -197,9 +206,6 @@ input {
 # blocks. Setting this block is optional, though the server will only attempt
 # autodetection for one sound card.
 #
-# See <http://mpd.wikia.com/wiki/Configuration#Audio_Outputs> for examples of 
-# other audio outputs.
-#
 # An example of an ALSA output:
 #
 audio_output {
@@ -273,6 +279,8 @@ audio_output {
 #}
 #
 # An example of a pulseaudio output (streaming to a remote pulseaudio server)
+# Please see README.Debian if you want mpd to play through the pulseaudio
+# daemon started as part of your graphical desktop session!
 #
 #audio_output {
 #	type		"pulse"
@@ -376,7 +384,7 @@ audio_output {
 # this may have undesired effects. Don't change this if you don't know what you
 # are doing.
 #
-#audio_buffer_size		"2048"
+#audio_buffer_size		"4096"
 #
 # This setting controls the percentage of the buffer which is filled before 
 # beginning to play. Increasing this reduces the chance of audio file skipping, 
@@ -401,37 +409,6 @@ 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 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/pkg-mpd.git