playlist: use uri_has_scheme() instead of isRemoteUrl()

src/playlist.c

@@ -565,7 +565,7 @@ song_by_url(const char *url)
 	if (song != NULL)
 		return song;
 
-	if (isRemoteUrl(url))
+	if (uri_has_scheme(url))
 		return song_remote_new(url);
 
 	return NULL;

src/playlist_save.c

@@ -50,7 +50,7 @@ playlist_print_uri(FILE *file, const char *uri)
 	char tmp[MPD_PATH_MAX];
 	char *s;
 
-	if (playlist_saveAbsolutePaths && !isRemoteUrl(uri) &&
+	if (playlist_saveAbsolutePaths && !uri_has_scheme(uri) &&
 	    uri[0] != '/')
 		s = map_uri_fs(uri);
 	else

src/stored_playlist.c

@@ -165,7 +165,7 @@ spl_load(const char *utf8path)
 
 		g_strchomp(buffer);
 
-		if (!isRemoteUrl(s)) {
+		if (!uri_has_scheme(s)) {
 			struct song *song;
 
 			path_utf8 = map_fs_to_utf8(s, path_max_tmp);
@@ -366,21 +366,20 @@ spl_append_uri(const char *url, const char *utf8file)
 {
 	struct song *song;
 
-	song = db_get_song(url);
-	if (song)
-		return spl_append_song(utf8file, song);
-
-	if (!isRemoteUrl(url))
-		return PLAYLIST_RESULT_NO_SUCH_SONG;
+	if (uri_has_scheme(url)) {
+		enum playlist_result ret;
 
-	song = song_remote_new(url);
-	if (song) {
-		enum playlist_result ret = spl_append_song(utf8file, song);
+		song = song_remote_new(url);
+		ret = spl_append_song(utf8file, song);
 		song_free(song);
 		return ret;
-	}
+	} else {
+		song = db_get_song(url);
+		if (song == NULL)
+			return PLAYLIST_RESULT_NO_SUCH_SONG;
 
-	return PLAYLIST_RESULT_NO_SUCH_SONG;
+		return spl_append_song(utf8file, song);
+	}
 }
 
 static enum playlist_result