Merge branch 'mk/tag'

* mk/tag: (22 commits)
  tag: fix segfault on update
  utf8.h: Fix build (broken os_compat.h #include)
  tag: optimize tag_dup(), copy item references
  tag: fix the shout and oggflac plugins
  const pointers
  tag: static directory name
  tag: try not to reallocate tag.items in every add() call
  song: don't export newNullSong()
  tag: try not to duplicate the input string
  tag: pass length to fix_utf8()
  added "length" parameter to validUtf8String()
  assert value!=NULL in fix_utf8()
  tag: converted macro fixUtf8() to an inline function
  tag: added a pool for tag items
  tag: converted tag_item.value to a char array
  removed tree.c
  tag: converted MpdTag.items to a pointer list
  tag: moved code to tag_id3.c
  wavpack: tag_new() cannot fail
  tag: converted tag_add_item() to an inline function
  ...

1 files changed, 5 insertions, 5 deletions

diff --git a/src/playlist.c b/src/playlist.c
index ab5908ff1..9546dee70 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -969,7 +969,7 @@ int playPlaylistById(int fd, int id, int stopOnError)
 }
 
 /* This is used when we stream data out to shout while playing static files */
-MpdTag *playlist_current_tag(void)
+struct mpd_tag *playlist_current_tag(void)
 {
 	Song *song = song_at(playlist.current);
 
@@ -981,18 +981,18 @@ MpdTag *playlist_current_tag(void)
 static void sync_metadata(void)
 {
 	Song *song;
-	MpdTag *tag;
+	struct mpd_tag *tag;
 
 	if (!(tag = metadata_pipe_current()))
 		return;
 	song = song_at(playlist.current);
 	if (!song || song->type != SONG_TYPE_URL ||
-	    mpdTagsAreEqual(song->tag, tag)) {
-		freeMpdTag(tag);
+	    tag_equal(song->tag, tag)) {
+		tag_free(tag);
 		return;
 	}
 	if (song->tag)
-		freeMpdTag(song->tag);
+		tag_free(song->tag);
 	song->tag = tag;
 	playlist.songMod[playlist.order[playlist.current]] = playlist.version;
 	incrPlaylistVersion();