aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-02-03 23:33:01 +0100
committerMax Kellermann <max@duempel.org>2014-02-03 23:33:25 +0100
commitd533b59ee33f13df854b0adb2588ab03bcaedfff (patch)
tree64140bd94511c97c70e94d764d26dbd49237bb5b
parent5ad2980d69409b5f307dcea57f2107bbcfcffc70 (diff)
downloadmpd-d533b59ee33f13df854b0adb2588ab03bcaedfff.tar.gz
mpd-d533b59ee33f13df854b0adb2588ab03bcaedfff.tar.xz
mpd-d533b59ee33f13df854b0adb2588ab03bcaedfff.zip
PlaylistFile: switch spl_append_uri() arguments
Playlist file name first, to be consistent with the other functions in this library.
-rw-r--r--src/PlaylistFile.cxx2
-rw-r--r--src/PlaylistFile.hxx2
-rw-r--r--src/command/PlaylistCommands.cxx2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx
index 00e638c9a..11d5fc302 100644
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@@ -402,7 +402,7 @@ spl_append_song(const char *utf8path, const DetachedSong &song, Error &error)
}
bool
-spl_append_uri(const char *url, const char *utf8file, Error &error)
+spl_append_uri(const char *utf8file, const char *url, Error &error)
{
if (uri_has_scheme(url)) {
return spl_append_song(utf8file, DetachedSong(url),
diff --git a/src/PlaylistFile.hxx b/src/PlaylistFile.hxx
index 4d741bf8e..75aba71d4 100644
--- a/src/PlaylistFile.hxx
+++ b/src/PlaylistFile.hxx
@@ -71,7 +71,7 @@ bool
spl_append_song(const char *utf8path, const DetachedSong &song, Error &error);
bool
-spl_append_uri(const char *file, const char *utf8file, Error &error);
+spl_append_uri(const char *path_utf8, const char *uri_utf8, Error &error);
bool
spl_rename(const char *utf8from, const char *utf8to, Error &error);
diff --git a/src/command/PlaylistCommands.cxx b/src/command/PlaylistCommands.cxx
index c3c4fe37c..f624386a6 100644
--- a/src/command/PlaylistCommands.cxx
+++ b/src/command/PlaylistCommands.cxx
@@ -194,7 +194,7 @@ handle_playlistadd(Client &client, gcc_unused int argc, char *argv[])
return CommandResult::ERROR;
}
- success = spl_append_uri(uri, playlist, error);
+ success = spl_append_uri(playlist, uri, error);
} else {
#ifdef ENABLE_DATABASE
success = search_add_to_playlist(uri, playlist, nullptr,