From d2606baa7923c2ba6befd87a6c8acf20ce5376f1 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 22 Oct 2008 17:23:58 +0200 Subject: stored_playlist: de-CamelCase moved function Rename addToStoredPlaylist() to spl_append_uri(), and remove the clearStoredPlaylist() macro. --- src/command.c | 4 ++-- src/stored_playlist.c | 3 ++- src/stored_playlist.h | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/command.c b/src/command.c index 17ee7dbed..c1f0b3f3d 100644 --- a/src/command.c +++ b/src/command.c @@ -1115,7 +1115,7 @@ static int handlePlaylistClear(struct client *client, { enum playlist_result result; - result = clearStoredPlaylist(argv[1]); + result = spl_clear(argv[1]); return print_playlist_result(client, result); } @@ -1127,7 +1127,7 @@ static int handlePlaylistAdd(struct client *client, enum playlist_result result; if (isRemoteUrl(path)) - result = addToStoredPlaylist(path, playlist); + result = spl_append_uri(path, playlist); else result = addAllInToStoredPlaylist(path, playlist); diff --git a/src/stored_playlist.c b/src/stored_playlist.c index 1a8d64e5c..bbffa510b 100644 --- a/src/stored_playlist.c +++ b/src/stored_playlist.c @@ -317,7 +317,8 @@ spl_append_song(const char *utf8path, struct song *song) return PLAYLIST_RESULT_SUCCESS; } -int addToStoredPlaylist(const char *url, const char *utf8file) +int +spl_append_uri(const char *url, const char *utf8file) { struct song *song; diff --git a/src/stored_playlist.h b/src/stored_playlist.h index 7d2ebf301..98b6505be 100644 --- a/src/stored_playlist.h +++ b/src/stored_playlist.h @@ -33,15 +33,14 @@ spl_move_index(const char *utf8path, int src, int dest); enum playlist_result spl_clear(const char *utf8path); -#define clearStoredPlaylist spl_clear - enum playlist_result spl_remove_index(const char *utf8path, int pos); enum playlist_result spl_append_song(const char *utf8path, struct song *song); -int addToStoredPlaylist(const char *file, const char *utf8file); +int +spl_append_uri(const char *file, const char *utf8file); enum playlist_result spl_rename(const char *utf8from, const char *utf8to); -- cgit v1.2.3