1 files changed, 46 insertions, 43 deletions

diff --git a/src/playlist/SoundCloudPlaylistPlugin.cxx b/src/playlist/SoundCloudPlaylistPlugin.cxx
index f6797b14d..0ab250b22 100644
--- a/src/playlist/SoundCloudPlaylistPlugin.cxx
+++ b/src/playlist/SoundCloudPlaylistPlugin.cxx
@@ -24,7 +24,8 @@
 #include "ConfigData.hxx"
 #include "InputStream.hxx"
 #include "Song.hxx"
-#include "tag/Tag.hxx"
+#include "tag/TagBuilder.hxx"
+#include "util/StringUtil.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
@@ -62,12 +63,13 @@ soundcloud_init(const config_param &param)
  * @return Constructed URL. Must be freed with g_free.
  */
 static char *
-soundcloud_resolve(const char* uri) {
+soundcloud_resolve(const char* uri)
+{
 	char *u, *ru;
 
-	if (g_str_has_prefix(uri, "http://")) {
+	if (StringStartsWith(uri, "http://")) {
 		u = g_strdup(uri);
-	} else if (g_str_has_prefix(uri, "soundcloud.com")) {
+	} else if (StringStartsWith(uri, "soundcloud.com")) {
 		u = g_strconcat("http://", uri, nullptr);
 	} else {
 		/* assume it's just a path on soundcloud.com */
@@ -108,12 +110,13 @@ struct parse_data {
 	std::forward_list<SongPointer> songs;
 };
 
-static int handle_integer(void *ctx,
-			  long
+static int
+handle_integer(void *ctx,
+	       long
 #ifndef HAVE_YAJL1
-			  long
+	       long
 #endif
-			  intval)
+	       intval)
 {
 	struct parse_data *data = (struct parse_data *) ctx;
 
@@ -128,13 +131,14 @@ static int handle_integer(void *ctx,
 	return 1;
 }
 
-static int handle_string(void *ctx, const unsigned char* stringval,
+static int
+handle_string(void *ctx, const unsigned char* stringval,
 #ifdef HAVE_YAJL1
-			 unsigned int
+	      unsigned int
 #else
-			 size_t
+	      size_t
 #endif
-			 stringlen)
+	      stringlen)
 {
 	struct parse_data *data = (struct parse_data *) ctx;
 	const char *s = (const char *) stringval;
@@ -158,13 +162,14 @@ static int handle_string(void *ctx, const unsigned char* stringval,
 	return 1;
 }
 
-static int handle_mapkey(void *ctx, const unsigned char* stringval,
+static int
+handle_mapkey(void *ctx, const unsigned char* stringval,
 #ifdef HAVE_YAJL1
-			 unsigned int
+	      unsigned int
 #else
-			 size_t
+	      size_t
 #endif
-			 stringlen)
+	      stringlen)
 {
 	struct parse_data *data = (struct parse_data *) ctx;
 
@@ -181,7 +186,8 @@ static int handle_mapkey(void *ctx, const unsigned char* stringval,
 	return 1;
 }
 
-static int handle_start_map(void *ctx)
+static int
+handle_start_map(void *ctx)
 {
 	struct parse_data *data = (struct parse_data *) ctx;
 
@@ -191,7 +197,8 @@ static int handle_start_map(void *ctx)
 	return 1;
 }
 
-static int handle_end_map(void *ctx)
+static int
+handle_end_map(void *ctx)
 {
 	struct parse_data *data = (struct parse_data *) ctx;
 
@@ -206,19 +213,16 @@ static int handle_end_map(void *ctx)
 	/* got_url == 1, track finished, make it into a song */
 	data->got_url = 0;
 
-	Song *s;
-	char *u;
-
-	u = g_strconcat(data->stream_url, "?client_id=",
-			soundcloud_config.apikey.c_str(), nullptr);
-	s = Song::NewRemote(u);
+	char *u = g_strconcat(data->stream_url, "?client_id=",
+			      soundcloud_config.apikey.c_str(), nullptr);
+	Song *s = Song::NewRemote(u);
 	g_free(u);
 
-	Tag *t = new Tag();
-	t->time = data->duration / 1000;
+	TagBuilder tag;
+	tag.SetTime(data->duration / 1000);
 	if (data->title != nullptr)
-		t->AddItem(TAG_NAME, data->title);
-	s->tag = t;
+		tag.AddItem(TAG_NAME, data->title);
+	s->tag = tag.Commit();
 
 	data->songs.emplace_front(s);
 
@@ -249,9 +253,6 @@ static int
 soundcloud_parse_json(const char *url, yajl_handle hand,
 		      Mutex &mutex, Cond &cond)
 {
-	char buffer[4096];
-	unsigned char *ubuffer = (unsigned char *)buffer;
-
 	Error error;
 	InputStream *input_stream = InputStream::Open(url, mutex, cond,
 						      error);
@@ -268,6 +269,8 @@ soundcloud_parse_json(const char *url, yajl_handle hand,
 	int done = 0;
 
 	while (!done) {
+		char buffer[4096];
+		unsigned char *ubuffer = (unsigned char *)buffer;
 		const size_t nbytes =
 			input_stream->Read(buffer, sizeof(buffer), error);
 		if (nbytes == 0) {
@@ -318,22 +321,22 @@ soundcloud_parse_json(const char *url, yajl_handle hand,
  *	soundcloud://playlist/<playlist-id>
  *	soundcloud://url/<url or path of soundcloud page>
  */
-
 static SongEnumerator *
 soundcloud_open_uri(const char *uri, Mutex &mutex, Cond &cond)
 {
-	char *s, *p;
-	char *scheme, *arg, *rest;
-	s = g_strdup(uri);
-	scheme = s;
-	for (p = s; *p; p++) {
+	char *s = g_strdup(uri);
+	char *scheme = s;
+
+	char *p = s;
+	for (; *p; p++) {
 		if (*p == ':' && *(p+1) == '/' && *(p+2) == '/') {
 			*p = 0;
 			p += 3;
 			break;
 		}
 	}
-	arg = p;
+
+	char *arg = p;
 	for (; *p; p++) {
 		if (*p == '/') {
 			*p = 0;
@@ -341,7 +344,8 @@ soundcloud_open_uri(const char *uri, Mutex &mutex, Cond &cond)
 			break;
 		}
 	}
-	rest = p;
+
+	char *rest = p;
 
 	if (strcmp(scheme, "soundcloud") != 0) {
 		FormatWarning(soundcloud_domain,
@@ -372,16 +376,15 @@ soundcloud_open_uri(const char *uri, Mutex &mutex, Cond &cond)
 		return nullptr;
 	}
 
-	yajl_handle hand;
 	struct parse_data data;
-
 	data.got_url = 0;
 	data.title = nullptr;
 	data.stream_url = nullptr;
 #ifdef HAVE_YAJL1
-	hand = yajl_alloc(&parse_callbacks, nullptr, nullptr, (void *) &data);
+	yajl_handle hand = yajl_alloc(&parse_callbacks, nullptr, nullptr,
+				      &data);
 #else
-	hand = yajl_alloc(&parse_callbacks, nullptr, (void *) &data);
+	yajl_handle hand = yajl_alloc(&parse_callbacks, nullptr, &data);
 #endif
 
 	int ret = soundcloud_parse_json(u, hand, mutex, cond);