[Pkg-mpd-commits] [SCM] Git repository for pkg-mpd branch, master, updated. debian/0.16.1-1-15-g41660d7

[Alexander Wirt]

The following commit has been merged in the master branch:
commit aa12b160788a028881821fe8d9087eb3f55e0716
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Feb 20 10:50:48 2011 +0100

    Update mpd.conf and mention vbrfix package
    
    Closes: #568388

diff --git a/debian/mpd.conf b/debian/mpd.conf
index 193c064..851ae53 100644
--- a/debian/mpd.conf
+++ b/debian/mpd.conf
@@ -49,6 +49,11 @@ pid_file			"/var/run/mpd/pid"
 #
 state_file			"/var/lib/mpd/state"
 #
+# The location of the sticker database.  This is a database which
+# manages dynamic information attached to songs.
+#
+sticker_file                   "/var/lib/mpd/sticker.sql"
+#
 ###############################################################################
 
 
@@ -61,9 +66,17 @@ state_file			"/var/lib/mpd/state"
 #
 user				"mpd"
 #
+# This setting specifies the group that MPD will run as. If not specified
+# primary group of user specified with "user" setting will be used (if set).
+# This is useful if MPD needs to be a member of group such as "audio" to
+# have permission to use sound card.
+#
+#group                          "nogroup"
+#
 # This setting sets the address for the daemon to listen on. Careful attention
 # should be paid if this is assigned to anything other then the default, any.
-# This setting can deny access to control of the daemon.
+# This setting can deny access to control of the daemon. Choose any if you want
+# to have mpd listen on every address
 #
 # For network
 bind_to_address		"localhost"
@@ -86,7 +99,7 @@ bind_to_address		"localhost"
 # If you have a problem with your MP3s ending abruptly it is recommended that 
 # you set this argument to "no" to attempt to fix the problem. If this solves
 # the problem, it is highly recommended to fix the MP3 files with vbrfix
-# (available from <http://www.willwap.co.uk/Programs/vbrfix.php>), at which
+# (available as vbrfix in the debian archive), at which
 # point gapless MP3 playback can be enabled.
 #
 #gapless_mp3_playback			"yes"
@@ -102,6 +115,16 @@ bind_to_address		"localhost"
 #
 #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 
+# music_directory are changed.
+#
+#auto_update    "yes"
+#
+# Limit the depth of the directories being watched, 0 means only watch
+# the music directory itself.  There is no limit by default.
+#
+#auto_update_depth "3"
+#
 ###############################################################################
 
 
@@ -216,6 +239,18 @@ audio_output {
 #	timeout		"2"			# optional
 #}
 #
+# An example of a recorder output:
+#
+#audio_output {
+#       type            "recorder"
+#       name            "My recorder"
+#       encoder         "vorbis"                # optional, vorbis or lame
+#       path            "/var/lib/mpd/recorder/mpd.ogg"
+##      quality         "5.0"                   # do not define if bitrate is defined
+#       bitrate         "128"                   # do not define if quality is defined
+#       format          "44100:16:1"
+#}
+#
 # An example of a httpd output (built-in HTTP streaming server):
 #
 #audio_output {
@@ -367,3 +402,27 @@ filesystem_charset		"UTF-8"
 id3v1_encoding			"UTF-8"
 #
 ###############################################################################
+# SIDPlay decoder #############################################################
+#
+# songlength_database:
+#  Location of your songlengths file, as distributed with the HVSC.
+#  The sidplay plugin checks this for matching MD5 fingerprints.
+#  See http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq
+#
+# default_songlength:
+#  This is the default playing time in seconds for songs not in the
+#  songlength database, or in case you're not using a database.
+#  A value of 0 means play indefinitely.
+#
+# filter:
+#  Turns the SID filter emulation on or off.
+#
+#decoder {
+#       plugin                  "sidplay"
+#       songlength_database     "/media/C64Music/DOCUMENTS/Songlengths.txt"
+#       default_songlength      "120"
+#       filter "true"
+#}
+#
+###############################################################################
+

-- 
Git repository for pkg-mpd