[Pkg-mpd-commits] [pkg-mpd] 05/12: Update mpd.conf in accordance with the upstream sample

[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 c3ed4abb32936338fa3c108799c63b82878e91df
Author: Florian Schlichting <fsfs at debian.org>
Date:   Fri Nov 22 00:31:18 2013 +0100

    Update mpd.conf in accordance with the upstream sample
    
    from upstream git:
    
        doc/example: remove "format" and "audio_output_format"
    
        Just an attempt to prevent users from shooting themselves in the foot
        by uncommenting these lines without knowing what they're doing.
---
 debian/mpd.conf | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/debian/mpd.conf b/debian/mpd.conf
index 1439167..532f3a3 100644
--- a/debian/mpd.conf
+++ b/debian/mpd.conf
@@ -206,7 +206,6 @@ audio_output {
 	type		"alsa"
 	name		"My ALSA Device"
 #	device		"hw:0,0"	# optional
-#	format		"44100:16:2"	# optional
 #	mixer_type      "hardware"      # optional
 #	mixer_device	"default"	# optional
 #	mixer_control	"PCM"		# optional
@@ -219,7 +218,6 @@ audio_output {
 #	type		"oss"
 #	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
@@ -323,12 +321,6 @@ audio_output {
 #	mixer_type      "none"                  # optional
 #}
 #
-# This setting will change all decoded audio to be converted to the specified
-# format before being passed to the audio outputs. By default, this setting is
-# disabled.
-#
-#audio_output_format		"44100:16:2"
-#
 # If MPD has been compiled with libsamplerate support, this setting specifies 
 # the sample rate converter to use.  Possible values can be found in the 
 # mpd.conf man page or the libsamplerate documentation. By default, this is

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