1 files changed, 26 insertions, 44 deletions

diff --git a/src/playlist/PlsPlaylistPlugin.cxx b/src/playlist/PlsPlaylistPlugin.cxx
index 99be3ad35..103451dfe 100644
--- a/src/playlist/PlsPlaylistPlugin.cxx
+++ b/src/playlist/PlsPlaylistPlugin.cxx
@@ -22,8 +22,8 @@
 #include "PlaylistPlugin.hxx"
 #include "MemorySongEnumerator.hxx"
 #include "InputStream.hxx"
-#include "Song.hxx"
-#include "tag/Tag.hxx"
+#include "DetachedSong.hxx"
+#include "tag/TagBuilder.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
@@ -32,13 +32,14 @@
 
 #include <string>
 
+#include <stdio.h>
+
 static constexpr Domain pls_domain("pls");
 
 static void
-pls_parser(GKeyFile *keyfile, std::forward_list<SongPointer> &songs)
+pls_parser(GKeyFile *keyfile, std::forward_list<DetachedSong> &songs)
 {
 	gchar *value;
-	int length;
 	GError *error = nullptr;
 	int num_entries = g_key_file_get_integer(keyfile, "playlist",
 						 "NumberOfEntries", &error);
@@ -57,13 +58,11 @@ pls_parser(GKeyFile *keyfile, std::forward_list<SongPointer> &songs)
 		}
 	}
 
-	while (num_entries > 0) {
-		Song *song;
-
+	for (; num_entries > 0; --num_entries) {
 		char key[64];
 		sprintf(key, "File%u", num_entries);
-		value = g_key_file_get_string(keyfile, "playlist", key,
-					      &error);
+		char *uri = g_key_file_get_string(keyfile, "playlist", key,
+						  &error);
 		if(error) {
 			FormatError(pls_domain, "Invalid PLS entry %s: '%s'",
 				    key, error->message);
@@ -71,36 +70,24 @@ pls_parser(GKeyFile *keyfile, std::forward_list<SongPointer> &songs)
 			return;
 		}
 
-		song = Song::NewRemote(value);
-		g_free(value);
+		TagBuilder tag;
 
 		sprintf(key, "Title%u", num_entries);
 		value = g_key_file_get_string(keyfile, "playlist", key,
-					      &error);
-		if(error == nullptr && value){
-			if (song->tag == nullptr)
-				song->tag = new Tag();
-			song->tag->AddItem(TAG_TITLE, value);
-		}
-		/* Ignore errors? Most likely value not present */
-		if(error) g_error_free(error);
-		error = nullptr;
+					      nullptr);
+		if (value != nullptr)
+			tag.AddItem(TAG_TITLE, value);
+
 		g_free(value);
 
 		sprintf(key, "Length%u", num_entries);
-		length = g_key_file_get_integer(keyfile, "playlist", key,
-						&error);
-		if(error == nullptr && length > 0){
-			if (song->tag == nullptr)
-				song->tag = new Tag();
-			song->tag->time = length;
-		}
-		/* Ignore errors? Most likely value not present */
-		if(error) g_error_free(error);
-		error = nullptr;
+		int length = g_key_file_get_integer(keyfile, "playlist", key,
+						    nullptr);
+		if (length > 0)
+			tag.SetTime(length);
 
-		songs.emplace_front(song);
-		num_entries--;
+		songs.emplace_front(uri, tag.Commit());
+		g_free(uri);
 	}
 
 }
@@ -110,15 +97,12 @@ pls_open_stream(InputStream &is)
 {
 	GError *error = nullptr;
 	Error error2;
-	size_t nbytes;
-	char buffer[1024];
-	bool success;
-	GKeyFile *keyfile;
 
 	std::string kf_data;
 
 	do {
-		nbytes = is.LockRead(buffer, sizeof(buffer), error2);
+		char buffer[1024];
+		size_t nbytes = is.LockRead(buffer, sizeof(buffer), error2);
 		if (nbytes == 0) {
 			if (error2.IsDefined()) {
 				LogError(error2);
@@ -137,12 +121,10 @@ pls_open_stream(InputStream &is)
 		return nullptr;
 	}
 
-	keyfile = g_key_file_new();
-	success = g_key_file_load_from_data(keyfile,
-					    kf_data.data(), kf_data.length(),
-					    G_KEY_FILE_NONE, &error);
-
-	if (!success) {
+	GKeyFile *keyfile = g_key_file_new();
+	if (!g_key_file_load_from_data(keyfile,
+				       kf_data.data(), kf_data.length(),
+				       G_KEY_FILE_NONE, &error)) {
 		FormatError(pls_domain,
 			    "KeyFile parser failed: %s", error->message);
 		g_error_free(error);
@@ -150,7 +132,7 @@ pls_open_stream(InputStream &is)
 		return nullptr;
 	}
 
-	std::forward_list<SongPointer> songs;
+	std::forward_list<DetachedSong> songs;
 	pls_parser(keyfile, songs);
 	g_key_file_free(keyfile);