merge changes from metadata-rewrite branch

git-svn-id: https://svn.musicpd.org/mpd/trunk@2589 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-10 21:58:27 +00:00
parent 86cf70dcb2
commit c5d27d8eaa
31 changed files with 1038 additions and 723 deletions
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -199,6 +199,10 @@ audio_output {

 ################ MISCELLANEOUS OPTIONS ###################
 #
+# This sets the metadata mpd will use, to disable all metadata, set to "none"
+#
+#metadata_to_use	"artist,album,title,genre,date,track"
+#
 # This setting exists as precaution against attacks.
 #
 #max_playlist_length 	"16384"