oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

playlist: use uri_has_scheme() instead of isRemoteUrl()

Browse Source 
For internal checks (i.e. not in command.c), we need to check whether
an URI is in the databse, in the local file system or a remote URI
with a scheme.
This commit is contained in:
Max Kellermann 2009-01-04 16:23:33 +01:00
parent 7d87f71d83
commit 17d8bdb427
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/playlist.c
View File

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

2
src/playlist_save.c
View File

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

23
src/stored_playlist.c
View File

@ -165,7 +165,7 @@ spl_load(const char *utf8path)
g_strchomp(buffer); g_strchomp(buffer);
if (!isRemoteUrl(s)) { if (!uri_has_scheme(s)) {
struct song *song; struct song *song;
path_utf8 = map_fs_to_utf8(s, path_max_tmp); 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; struct song *song;
song = db_get_song(url); if (uri_has_scheme(url)) {
if (song) enum playlist_result ret;
return spl_append_song(utf8file, song);
if (!isRemoteUrl(url)) song = song_remote_new(url);
return PLAYLIST_RESULT_NO_SUCH_SONG; ret = spl_append_song(utf8file, song);
song = song_remote_new(url);
if (song) {
enum playlist_result ret = spl_append_song(utf8file, song);
song_free(song); song_free(song);
return ret; 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 static enum playlist_result