Merge branch 'master' into devel

Conflicts:
	main.c
	plugins/flac/flac.c
	plugins/mpgmad/mpgmad.c
	streamer.c

1 files changed, 6 insertions, 3 deletions

diff --git a/playlist.h b/playlist.h
index 0d37e1b4..c168c4aa 100644
--- a/playlist.h
+++ b/playlist.h
@@ -146,13 +146,16 @@ pl_insert_cue (playItem_t *after, playItem_t *origin, int numsamples, int sample
 void
 pl_add_meta (playItem_t *it, const char *key, const char *value);
 
-void
-pl_format_item_display_name (playItem_t *it, char *str, int len);
-
 const char *
 pl_find_meta (playItem_t *it, const char *key);
 
 void
+pl_replace_meta (playItem_t *it, const char *key, const char *value);
+
+void
+pl_format_item_display_name (playItem_t *it, char *str, int len);
+
+void
 pl_delete_all_meta (playItem_t *it);
 
 // returns index of 1st deleted item