aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-22 17:24:40 +0200
committerMax Kellermann <max@duempel.org>2008-10-22 17:24:40 +0200
commit3a164ef8e61c27eb69d83e479cced6ea1b03b07d (patch)
tree7f89c8de04eff31eb1b5005b17fbae3cd3fc819a
parentd2606baa7923c2ba6befd87a6c8acf20ce5376f1 (diff)
downloadmpd-3a164ef8e61c27eb69d83e479cced6ea1b03b07d.tar.gz
mpd-3a164ef8e61c27eb69d83e479cced6ea1b03b07d.tar.xz
mpd-3a164ef8e61c27eb69d83e479cced6ea1b03b07d.zip
stored_playlist: spl_append_uri() returns enum playlist_result
The return value of spl_append_uri() was somewhat buggy: some branches returned ACK_* values, and some an enum playlist_result. Unify this.
Diffstat (limited to '')
-rw-r--r--src/stored_playlist.c7
-rw-r--r--src/stored_playlist.h2
2 files changed, 4 insertions, 5 deletions
diff --git a/src/stored_playlist.c b/src/stored_playlist.c
index bbffa510b..ad9e43ce4 100644
--- a/src/stored_playlist.c
+++ b/src/stored_playlist.c
@@ -25,7 +25,6 @@
#include "ls.h"
#include "database.h"
#include "idle.h"
-#include "ack.h"
#include "os_compat.h"
static ListNode *
@@ -317,7 +316,7 @@ spl_append_song(const char *utf8path, struct song *song)
return PLAYLIST_RESULT_SUCCESS;
}
-int
+enum playlist_result
spl_append_uri(const char *url, const char *utf8file)
{
struct song *song;
@@ -327,7 +326,7 @@ spl_append_uri(const char *url, const char *utf8file)
return spl_append_song(utf8file, song);
if (!isValidRemoteUtf8Url(url))
- return ACK_ERROR_NO_EXIST;
+ return PLAYLIST_RESULT_NO_SUCH_SONG;
song = song_remote_new(url);
if (song) {
@@ -336,7 +335,7 @@ spl_append_uri(const char *url, const char *utf8file)
return ret;
}
- return ACK_ERROR_NO_EXIST;
+ return PLAYLIST_RESULT_NO_SUCH_SONG;
}
enum playlist_result
diff --git a/src/stored_playlist.h b/src/stored_playlist.h
index 98b6505be..637a1093d 100644
--- a/src/stored_playlist.h
+++ b/src/stored_playlist.h
@@ -39,7 +39,7 @@ spl_remove_index(const char *utf8path, int pos);
enum playlist_result
spl_append_song(const char *utf8path, struct song *song);
-int
+enum playlist_result
spl_append_uri(const char *file, const char *utf8file);
enum playlist_result