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

playlist: moved code to song_by_url()

Browse Source 
Replace some complicated checks from addToPlaylist() to the simpler
function song_by_url().
This commit is contained in:
Max Kellermann 2008-10-15 22:35:00 +02:00
parent 6d3488c8b3
commit 961a349f15
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/playlist.c
View File

@ -521,17 +521,30 @@ static void clearPlayerQueue(void)
pc_cancel(); pc_cancel();
} }
static struct song *
song_by_url(const char *url)
{
struct song *song;
song = db_get_song(url);
if (song != NULL)
return song;
if (isValidRemoteUtf8Url(url))
return song_remote_new(url);
return NULL;
}
enum playlist_result addToPlaylist(const char *url, int *added_id) enum playlist_result addToPlaylist(const char *url, int *added_id)
{ {
struct song *song; struct song *song;
DEBUG("add to playlist: %s\n", url); DEBUG("add to playlist: %s\n", url);
if ((song = db_get_song(url))) { song = song_by_url(url);
} else if (!(isValidRemoteUtf8Url(url) && if (song == NULL)
(song = song_remote_new(url)))) {
return PLAYLIST_RESULT_NO_SUCH_SONG; return PLAYLIST_RESULT_NO_SUCH_SONG;
}
return addSongToPlaylist(song, added_id); return addSongToPlaylist(song, added_id);
} }