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, 7 insertions, 7 deletions

diff --git a/src/metadata_pipe.h b/src/metadata_pipe.h
index e54c67584..cb891aa80 100644
--- a/src/metadata_pipe.h
+++ b/src/metadata_pipe.h
@@ -29,21 +29,21 @@ void init_metadata_pipe(void);
  * DO NOT FREE the tag placed into the pipe; that is that job of the
  * caller of metadata_pipe_recv() or metadata_pipe_clear().
  */
-void metadata_pipe_send(MpdTag * tag, float metadata_time);
+void metadata_pipe_send(struct mpd_tag * tag, float metadata_time);
 
 /*
- * Reads and consumes one MpdTag pointer off the pipe.  The caller
- * of this MUST free the MpdTag pointer after it is done using it.
+ * Reads and consumes one struct mpd_tag pointer off the pipe.  The caller
+ * of this MUST free the struct mpd_tag pointer after it is done using it.
  */
-MpdTag * metadata_pipe_recv(void);
+struct mpd_tag * metadata_pipe_recv(void);
 
 /*
- * Returns the last read MpdTag from metadata_pipe_recv(), caller
+ * Returns the last read struct mpd_tag from metadata_pipe_recv(), caller
  * must free this pointer when it is done using it.
  */
-MpdTag * metadata_pipe_current(void);
+struct mpd_tag * metadata_pipe_current(void);
 
-/* Clears all MpdTag pointers on the pipe, freeing all associated elements */
+/* Clears all struct mpd_tag pointers on the pipe, freeing all associated elements */
 void metadata_pipe_clear(void);
 
 #endif /* METADATA_PIPE_H */