Merge branch 'v0.20.x'

src/playlist/plugins/SoundCloudPlaylistPlugin.cxx

@@ -27,6 +27,7 @@
 #include "config/Block.hxx"
 #include "input/InputStream.hxx"
 #include "tag/Builder.hxx"
+#include "util/ASCII.hxx"
 #include "util/StringCompare.hxx"
 #include "util/Alloc.hxx"
 #include "util/Domain.hxx"
@@ -69,7 +70,7 @@ soundcloud_resolve(const char* uri)
 {
 	char *u, *ru;
 
-	if (StringStartsWith(uri, "https://")) {
+	if (StringStartsWithCaseASCII(uri, "https://")) {
 		u = xstrdup(uri);
 	} else if (StringStartsWith(uri, "soundcloud.com")) {
 		u = xstrcatdup("https://", uri);
@@ -237,7 +238,7 @@ soundcloud_parse_json(const char *url, Yajl::Handle &handle,
 static std::unique_ptr<SongEnumerator>
 soundcloud_open_uri(const char *uri, Mutex &mutex)
 {
-	assert(strncmp(uri, "soundcloud://", 13) == 0);
+	assert(StringEqualsCaseASCII(uri, "soundcloud://", 13));
 	uri += 13;
 
 	char *u = nullptr;