1 files changed, 14 insertions, 107 deletions

diff --git a/src/tag/Tag.cxx b/src/tag/Tag.cxx
index 6bf070429..92ac4214c 100644
--- a/src/tag/Tag.cxx
+++ b/src/tag/Tag.cxx
@@ -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
@@ -22,9 +22,9 @@
 #include "TagPool.hxx"
 #include "TagString.hxx"
 #include "TagSettings.h"
+#include "TagBuilder.hxx"
 #include "util/ASCII.hxx"
 
-#include <glib.h>
 #include <assert.h>
 #include <string.h>
 
@@ -58,16 +58,10 @@ tag_name_parse_i(const char *name)
 	return TAG_NUM_OF_ITEM_TYPES;
 }
 
-static size_t
-items_size(const Tag &tag)
-{
-	return tag.num_items * sizeof(TagItem *);
-}
-
 void
 Tag::Clear()
 {
-	time = -1;
+	duration = SignedSongTime::Negative();
 	has_playlist = false;
 
 	tag_pool_lock.lock();
@@ -75,28 +69,18 @@ Tag::Clear()
 		tag_pool_put_item(items[i]);
 	tag_pool_lock.unlock();
 
-	g_free(items);
+	delete[] items;
 	items = nullptr;
 	num_items = 0;
 }
 
-Tag::~Tag()
-{
-	tag_pool_lock.lock();
-	for (int i = num_items; --i >= 0; )
-		tag_pool_put_item(items[i]);
-	tag_pool_lock.unlock();
-
-	g_free(items);
-}
-
 Tag::Tag(const Tag &other)
-	:time(other.time), has_playlist(other.has_playlist),
-	 items(nullptr),
-	 num_items(other.num_items)
+	:duration(other.duration), has_playlist(other.has_playlist),
+	 num_items(other.num_items),
+	 items(nullptr)
 {
 	if (num_items > 0) {
-		items = (TagItem **)g_malloc(items_size(other));
+		items = new TagItem *[num_items];
 
 		tag_pool_lock.lock();
 		for (unsigned i = 0; i < num_items; i++)
@@ -108,46 +92,9 @@ Tag::Tag(const Tag &other)
 Tag *
 Tag::Merge(const Tag &base, const Tag &add)
 {
-	unsigned n;
-
-	/* allocate new tag object */
-
-	Tag *ret = new Tag();
-	ret->time = add.time > 0 ? add.time : base.time;
-	ret->num_items = base.num_items + add.num_items;
-	ret->items = ret->num_items > 0
-		? (TagItem **)g_malloc(items_size(*ret))
-		: nullptr;
-
-	tag_pool_lock.lock();
-
-	/* copy all items from "add" */
-
-	for (unsigned i = 0; i < add.num_items; ++i)
-		ret->items[i] = tag_pool_dup_item(add.items[i]);
-
-	n = add.num_items;
-
-	/* copy additional items from "base" */
-
-	for (unsigned i = 0; i < base.num_items; ++i)
-		if (!add.HasType(base.items[i]->type))
-			ret->items[n++] = tag_pool_dup_item(base.items[i]);
-
-	tag_pool_lock.unlock();
-
-	assert(n <= ret->num_items);
-
-	if (n < ret->num_items) {
-		/* some tags were not copied - shrink ret->items */
-		assert(n > 0);
-
-		ret->num_items = n;
-		ret->items = (TagItem **)
-			g_realloc(ret->items, items_size(*ret));
-	}
-
-	return ret;
+	TagBuilder builder(add);
+	builder.Complement(base);
+	return builder.CommitNew();
 }
 
 Tag *
@@ -171,9 +118,9 @@ Tag::GetValue(TagType type) const
 {
 	assert(type < TAG_NUM_OF_ITEM_TYPES);
 
-	for (unsigned i = 0; i < num_items; i++)
-		if (items[i]->type == type)
-			return items[i]->value;
+	for (const auto &item : *this)
+		if (item.type == type)
+			return item.value;
 
 	return nullptr;
 }
@@ -183,43 +130,3 @@ Tag::HasType(TagType type) const
 {
 	return GetValue(type) != nullptr;
 }
-
-void
-Tag::AddItemInternal(TagType type, const char *value, size_t len)
-{
-	unsigned int i = num_items;
-
-	char *p = FixTagString(value, len);
-	if (p != nullptr) {
-		value = p;
-		len = strlen(value);
-	}
-
-	num_items++;
-
-	items = (TagItem **)g_realloc(items, items_size(*this));
-
-	tag_pool_lock.lock();
-	items[i] = tag_pool_get_item(type, value, len);
-	tag_pool_lock.unlock();
-
-	g_free(p);
-}
-
-void
-Tag::AddItem(TagType type, const char *value, size_t len)
-{
-	if (ignore_tag_items[type])
-		return;
-
-	if (value == nullptr || len == 0)
-		return;
-
-	AddItemInternal(type, value, len);
-}
-
-void
-Tag::AddItem(TagType type, const char *value)
-{
-	AddItem(type, value, strlen(value));
-}