1 files changed, 46 insertions, 3 deletions

diff --git a/src/tag/TagBuilder.hxx b/src/tag/TagBuilder.hxx
index ffc60a1b2..6de52b775 100644
--- a/src/tag/TagBuilder.hxx
+++ b/src/tag/TagBuilder.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -63,7 +63,14 @@ public:
 	}
 
 	TagBuilder(const TagBuilder &other) = delete;
-	TagBuilder &operator=(const TagBuilder &other) = delete;
+
+	explicit TagBuilder(const Tag &other);
+	explicit TagBuilder(Tag &&other);
+
+	TagBuilder &operator=(const TagBuilder &other);
+	TagBuilder &operator=(TagBuilder &&other);
+
+	TagBuilder &operator=(Tag &&other);
 
 	/**
 	 * Returns true if the tag contains no items.  This ignores the "time"
@@ -90,11 +97,17 @@ public:
 	void Commit(Tag &tag);
 
 	/**
+	 * Create a new #Tag instance from data in this object.  This
+	 * object is empty afterwards.
+	 */
+	Tag Commit();
+
+	/**
 	 * Create a new #Tag instance from data in this object.  The
 	 * returned object is owned by the caller.  This object is
 	 * empty afterwards.
 	 */
-	Tag *Commit();
+	Tag *CommitNew();
 
 	void SetTime(int _time) {
 		time = _time;
@@ -109,6 +122,19 @@ public:
 	}
 
 	/**
+	 * Checks whether the tag contains one or more items with
+	 * the specified type.
+	 */
+	gcc_pure
+	bool HasType(TagType type) const;
+
+	/**
+	 * Copy attributes and items from the other object that do not
+	 * exist in this object.
+	 */
+	void Complement(const Tag &other);
+
+	/**
 	 * Appends a new tag item.
 	 *
 	 * @param type the type of the new tag item
@@ -127,6 +153,23 @@ public:
 	gcc_nonnull_all
 	void AddItem(TagType type, const char *value);
 
+	/**
+	 * Appends a new tag item with an empty value.  Do not use
+	 * this unless you know what you're doing - because usually,
+	 * empty values are discarded.
+	 */
+	void AddEmptyItem(TagType type);
+
+	/**
+	 * Removes all tag items.
+	 */
+	void RemoveAll();
+
+	/**
+	 * Removes all tag items of the specified type.
+	 */
+	void RemoveType(TagType type);
+
 private:
 	gcc_nonnull_all
 	void AddItemInternal(TagType type, const char *value, size_t length);