1 files changed, 18 insertions, 16 deletions

diff --git a/src/playlist/XspfPlaylistPlugin.cxx b/src/playlist/XspfPlaylistPlugin.cxx
index dcfab5a80..2935225e4 100644
--- a/src/playlist/XspfPlaylistPlugin.cxx
+++ b/src/playlist/XspfPlaylistPlugin.cxx
@@ -22,14 +22,13 @@
 #include "PlaylistPlugin.hxx"
 #include "MemorySongEnumerator.hxx"
 #include "InputStream.hxx"
-#include "tag/Tag.hxx"
+#include "tag/TagBuilder.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
 
 #include <glib.h>
 
-#include <assert.h>
 #include <string.h>
 
 static constexpr Domain xspf_domain("xspf");
@@ -57,7 +56,7 @@ struct XspfParser {
 	 * valid if state==TRACK.  TAG_NUM_OF_ITEM_TYPES means there
 	 * is no (known) tag.
 	 */
-	TagType tag;
+	TagType tag_type;
 
 	/**
 	 * The current song.  It is allocated after the "location"
@@ -65,6 +64,8 @@ struct XspfParser {
 	 */
 	Song *song;
 
+	TagBuilder tag_builder;
+
 	XspfParser()
 		:state(ROOT) {}
 };
@@ -95,7 +96,7 @@ xspf_start_element(gcc_unused GMarkupParseContext *context,
 		if (strcmp(element_name, "track") == 0) {
 			parser->state = XspfParser::TRACK;
 			parser->song = nullptr;
-			parser->tag = TAG_NUM_OF_ITEM_TYPES;
+			parser->tag_type = TAG_NUM_OF_ITEM_TYPES;
 		}
 
 		break;
@@ -104,17 +105,17 @@ xspf_start_element(gcc_unused GMarkupParseContext *context,
 		if (strcmp(element_name, "location") == 0)
 			parser->state = XspfParser::LOCATION;
 		else if (strcmp(element_name, "title") == 0)
-			parser->tag = TAG_TITLE;
+			parser->tag_type = TAG_TITLE;
 		else if (strcmp(element_name, "creator") == 0)
 			/* TAG_COMPOSER would be more correct
 			   according to the XSPF spec */
-			parser->tag = TAG_ARTIST;
+			parser->tag_type = TAG_ARTIST;
 		else if (strcmp(element_name, "annotation") == 0)
-			parser->tag = TAG_COMMENT;
+			parser->tag_type = TAG_COMMENT;
 		else if (strcmp(element_name, "album") == 0)
-			parser->tag = TAG_ALBUM;
+			parser->tag_type = TAG_ALBUM;
 		else if (strcmp(element_name, "trackNum") == 0)
-			parser->tag = TAG_TRACK;
+			parser->tag_type = TAG_TRACK;
 
 		break;
 
@@ -148,12 +149,15 @@ xspf_end_element(gcc_unused GMarkupParseContext *context,
 
 	case XspfParser::TRACK:
 		if (strcmp(element_name, "track") == 0) {
-			if (parser->song != nullptr)
+			if (parser->song != nullptr) {
+				assert(parser->song->tag == nullptr);
+				parser->song->tag = parser->tag_builder.Commit();
 				parser->songs.emplace_front(parser->song);
+			}
 
 			parser->state = XspfParser::TRACKLIST;
 		} else
-			parser->tag = TAG_NUM_OF_ITEM_TYPES;
+			parser->tag_type = TAG_NUM_OF_ITEM_TYPES;
 
 		break;
 
@@ -178,11 +182,9 @@ xspf_text(gcc_unused GMarkupParseContext *context,
 
 	case XspfParser::TRACK:
 		if (parser->song != nullptr &&
-		    parser->tag != TAG_NUM_OF_ITEM_TYPES) {
-			if (parser->song->tag == nullptr)
-				parser->song->tag = new Tag();
-			parser->song->tag->AddItem(parser->tag, text, text_len);
-		}
+		    parser->tag_type != TAG_NUM_OF_ITEM_TYPES)
+			parser->tag_builder.AddItem(parser->tag_type,
+						    text, text_len);
 
 		break;