1 files changed, 12 insertions, 15 deletions

diff --git a/src/playlist/ExtM3uPlaylistPlugin.cxx b/src/playlist/ExtM3uPlaylistPlugin.cxx
index 8d260fec7..51211988c 100644
--- a/src/playlist/ExtM3uPlaylistPlugin.cxx
+++ b/src/playlist/ExtM3uPlaylistPlugin.cxx
@@ -21,13 +21,12 @@
 #include "ExtM3uPlaylistPlugin.hxx"
 #include "PlaylistPlugin.hxx"
 #include "SongEnumerator.hxx"
-#include "Song.hxx"
+#include "DetachedSong.hxx"
 #include "tag/Tag.hxx"
+#include "tag/TagBuilder.hxx"
 #include "util/StringUtil.hxx"
 #include "TextInputStream.hxx"
 
-#include <glib.h>
-
 #include <string.h>
 #include <stdlib.h>
 
@@ -45,7 +44,7 @@ public:
 			strcmp(line.c_str(), "#EXTM3U") == 0;
 	}
 
-	virtual Song *NextSong() override;
+	virtual DetachedSong *NextSong() override;
 };
 
 static SongEnumerator *
@@ -74,7 +73,6 @@ extm3u_parse_tag(const char *line)
 	long duration;
 	char *endptr;
 	const char *name;
-	Tag *tag;
 
 	duration = strtol(line, &endptr, 10);
 	if (endptr[0] != ',')
@@ -91,35 +89,34 @@ extm3u_parse_tag(const char *line)
 		   object */
 		return NULL;
 
-	tag = new Tag();
-	tag->time = duration;
+	TagBuilder tag;
+	tag.SetTime(duration);
 
 	/* unfortunately, there is no real specification for the
 	   EXTM3U format, so we must assume that the string after the
 	   comma is opaque, and is just the song name*/
 	if (*name != 0)
-		tag->AddItem(TAG_NAME, name);
+		tag.AddItem(TAG_NAME, name);
 
-	return tag;
+	return tag.CommitNew();
 }
 
-Song *
+DetachedSong *
 ExtM3uPlaylist::NextSong()
 {
 	Tag *tag = NULL;
 	std::string line;
 	const char *line_s;
-	Song *song;
 
 	do {
 		if (!tis.ReadLine(line)) {
 			delete tag;
 			return NULL;
 		}
-		
+
 		line_s = line.c_str();
 
-		if (g_str_has_prefix(line_s, "#EXTINF:")) {
+		if (StringStartsWith(line_s, "#EXTINF:")) {
 			delete tag;
 			tag = extm3u_parse_tag(line_s + 8);
 			continue;
@@ -128,8 +125,8 @@ ExtM3uPlaylist::NextSong()
 		line_s = strchug_fast(line_s);
 	} while (line_s[0] == '#' || *line_s == 0);
 
-	song = Song::NewRemote(line_s);
-	song->tag = tag;
+	DetachedSong *song = new DetachedSong(line_s, std::move(*tag));
+	delete tag;
 	return song;
 }