1) bumb version to 0.11.3

2) Update changelog for 0.11.3
3) Merge avuton's mpdconf.example changes

git-svn-id: https://svn.musicpd.org/mpd/trunk@1875 09075e82-0dd4-0310-85a5-a0d7c8717e4f

ChangeLog

@@ -1,3 +1,12 @@
+ver 0.11.3 (2004/7/21)
+1) Add support for http authentication for streams
+2) Added replaygain pre-amp support
+3) Better error handling for fread() in inputStream_file
+4) Fixed a bug so that when a freeAllInterfaces is called, it sets max_interface_connections to 0.  This prevents potential segfaults and other nastiness for forked processes, like the player and update-er (do to interfacePrintWithFD()).
+5) Allow blockingWrite() to handle errors more gracefully (for example, if the disc is full, and thus the write() fails or can't be completed, we just skip this write() and continue, instead of getting stuck in an infinite loop until the write() becomes successful)
+6) Updated mpdconf.example from sbh/avuton
+7) If "user" is specified, then convert ~ in paths to the user's home path specified by "user" config paramter (not the actual current user running mpd).
+
 ver 0.11.2 (2004/7/5) 
 1) Work around in computing total time for mp3's whose first valid mpeg frame is not layer III
 2) Fix mp3 and mp4 decoders when seeking past the end of the file

configure.ac

@@ -2,7 +2,7 @@ dnl AC_INIT(src/main.c)
 dnl AM_INIT_AUTOMAKE(mpd, 0.10.0)
 
 AC_PREREQ(2.52)
-AC_INIT(mpd, 0.11.2, shank@mercury.chem.pitt.edu)
+AC_INIT(mpd, 0.11.3, shank@mercury.chem.pitt.edu)
 AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
 
 dnl MAD wants this stuff

doc/mpdconf.example

@@ -2,118 +2,191 @@
 # For a full description of all config parameters,
 # Check the mpd man page, "man mpd".
 
-
+##################### REQUIRED ###########################
-########## REQUIRED ###############
 port 			"6600"
 music_directory 	"~/music"
 playlist_directory 	"~/.mpd/playlists"
 log_file 		"~/.mpd/mpd.log"
 error_file 		"~/.mpd/mpd.error"
-###################################
+##########################################################
 
-
+##########################################################
-###################################
 # EVERYTHING ELSE IS OPTIONAL
-###################################
+##########################################################
 
-
+################# FILESYSTEM SETTINGS ####################
-######### FILESYSTEM SETTINGS ###########
+#
-# If filenames or directory names don't
+# If the names of files or directories are 
-#     display correctly, set the character 
+# not correctly displayed then set the 
-#     set (encoding) for the filesystem
+# following to the filesystem coding. 
-#     here. The fileystem encoding is 
+#
-#     typically "ISO-8859-1" or "UTF-8".
+#	Usually this is either:
-#     After changing fileystem_charset,
+#	ISO-8859-1 or UTF-8
-#     recreate the db: mpd --create-db
+#
-#filesystem_charset "ISO-8859-1"
+# After changing the filesystem_charset
-#########################################
+# you will need to recreate the db:
-
+#	mpd --create-db
-
+#
-########### OPTIONAL FILES ##############
+#filesystem_charset "ISO-8859-1"
-# Location of DB file 
+#
-#db_file		"~/.mpd/mpddb"
+##########################################################
+
+#################### OPTIONAL FILES ######################
+#
+# Location of DB file 
+#
+#db_file		"~/.mpd/mpd.db"
+#
+# The state file (if set) will be a file
+# for storing all current information 
+# (playlist, playing/paused, etc...) from
+# the last MPD session. This will be used
+# to recreate your last MPD session after
+# restart.
 #
-# State file for storing state of mpd 
-#     when it is shutdown.  MPD will restore
-#     the state (i.e. load playlist, start
-#     playing, etc) upon restart.
 #state_file		"~/.mpd/mpdstate"
-##########################################
+#
+##########################################################
 
 
-######### VOLUME MIXER ############
+################### VOLUME MIXER #########################
-# for OSS Mixer
+#
-#mixer_type		"oss"
+# Examples:
-#mixer_device 		"/dev/mixer"
+# ALSA Mixer 
-#mixer_control		"Pcm"
-
-# for Alsa Mixer 
 #mixer_type		"alsa"
 #mixer_device		"default"
 #mixer_control		"PCM"
-
+#
-# for Software Mixer
+# OSS Mixer
+#mixer_type		"oss"
+#mixer_device 		"/dev/mixer"
+#mixer_control		"PCM"
+#
+# Software Mixer
 #mixer_type		"software"
-##################################
+#
+##########################################################
 
 
-######### AUDIO OUTPUT ###########
+################## AUDIO OUTPUT ##########################
-# for OSS Audio Output
+#
+# OSS Audio Output
 #ao_driver 		"oss"
 #ao_driver_options 	"dsp=/dev/dsp"
-
+#
-# for ALSA Audio Output
+# ALSA Audio Output
 #ao_driver		"alsa09"
 #ao_driver_options	"dev=hw:0,0"
-
+#
-# misc audio output options
+# Set this if you have problems 
+# playing audio files.
+# This will resample your music so
+# that it comes out at the set rate. 
+#
+#audio_output_format	"44100:16:2"
+#
+# You should not need mess with 
+# this value unless you know 
+# what you're doing.
+#
 #audio_write_size	"1024"
-# use track or album replaygain
+#
+##########################################################
+
+################# REPLAYGAIN #############################
+#
+# Use Replay Gain (album or title)
+#	http://www.replaygain.org
+#
 #replaygain		"album"
-##################################
+#
+# Sets the pre-amp used for files that have replaygain
+# info.  Valid values are between -15 to 15 (in dB).
+#
+#replaygain_preamp	"0"
+#
+##########################################################
 
 
-#### OUTPUT BUFFER SETTINGS ######
+################ OUTPUT BUFFER SETTINGS ##################
+#
+# You should not need to mess with this
+# unless you know what you're doing.
+#
 #audio_buffer_size	"2048"
+#
+# This means exactly what it says, it will
+# buffer your file up to the percentage of
+# the buffer before it begins playing.
+#
 #buffer_before_play 	"25%"
-##################################
+#
+##########################################################
 
 
-############ HTTP PROXY ################
+################### HTTP PROXY ###########################
+#
 # http_proxy_host	"proxy.isp.com"
 # http_proxy_port	"8080"
 # http_proxy_user	"user"
 # http_proxy_password	"password"
-########################################
+#
+##########################################################
 
 
-########### SECURITY SETTINGS ############
+################# SECURITY SETTINGS ######################
-# if you start mpd as root, its recommended
+#
-#     you specify a a user for mpd to run.
+# It is encouraged to run MPD as 
+# non-superuser.  If you start mpd as root
+# (for example, in an init script), set
+# this value, then  mpd will drop root priveleges
+# and runs as the user specified.
+#
 #user 		"nobody"
-
+#
-# to only allow connections from localhost
+# Set this value if you only have one 
+# address you want to allow connection to. 
+#
 #bind_to_address 	"localhost"
-
+#
-# Specify one or more passwords required to
+# If you want to setup MPD to use 
-#     access mpd:
+# passwords set them here
+#
 #password 		"password1@read,add,control,admin"
 #password 		"password2@read"
-
+#
 # Specify permissions used by default when no password is 
-#     given by for a connection/client.
+# given by for a connection/client.
+#
 #default_permissions	"read,add,control,admin"
+#
 ##########################################
 
 
-########### MISC OPTIONS #################
+################ MISCELLANEOUS OPTIONS ###################
+#
+# This setting exists as precaution against attacks.
+#
 #max_playlist_length 	"16384"
-#connection_timeout 	"60"
+#
-#max_connections 	"5"
+# Valid options are "default", "secure" or "verbose".
-#max_command_list_size 	"2048"
-#max_output_buffer_size 	"2048"
-#save_absolute_paths_in_playlists "no"
-
-# log_level can be "default", "secure", "verbose"
 #log_level		"default"
-#########################################
+#
+#connection_timeout 	"60"
+#
+# This should be fine for 2-3 people using clients 
+# at the same time.
+#
+#max_connections 	"5"
+#
+# No need to change these unless you know better.
+#
+#max_command_list_size 	"2048"
+#max_output_buffer_size "2048"
+#
+# This will make playlists compatible with normal music
+# players.
+#
+#save_absolute_paths_in_playlists "no"
+#
+##########################################################