aboutsummaryrefslogtreecommitdiffstats
path: root/src/playlist_save.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-04 18:56:41 +0100
committerMax Kellermann <max@duempel.org>2009-02-04 18:56:41 +0100
commit8d3205871cf398c4e187bb0d1ead28c46a25a8c1 (patch)
treed50a3219a796cff081316d9a31d6bb4f9edc2d2c /src/playlist_save.c
parent1720c7090dc3d590ffe1b5175e175143c09266f8 (diff)
downloadmpd-8d3205871cf398c4e187bb0d1ead28c46a25a8c1.tar.gz
mpd-8d3205871cf398c4e187bb0d1ead28c46a25a8c1.tar.xz
mpd-8d3205871cf398c4e187bb0d1ead28c46a25a8c1.zip
playlist: renamed global "playlist" variable to "g_playlist"
Export the "g_playlist" variable, and pass it to all playlist functions. This way, we can split playlist.c easier into separate parts. The code which initializes the singleton variable is moved to playlist_global.c.
Diffstat (limited to '')
-rw-r--r--src/playlist_save.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/playlist_save.c b/src/playlist_save.c
index 41538b620..f1634eb56 100644
--- a/src/playlist_save.c
+++ b/src/playlist_save.c
@@ -98,7 +98,7 @@ spl_save_queue(const char *name_utf8, const struct queue *queue)
}
enum playlist_result
-playlist_load_spl(const char *name_utf8)
+playlist_load_spl(struct playlist *playlist, const char *name_utf8)
{
GPtrArray *list;
@@ -108,7 +108,7 @@ playlist_load_spl(const char *name_utf8)
for (unsigned i = 0; i < list->len; ++i) {
const char *temp = g_ptr_array_index(list, i);
- if ((addToPlaylist(temp, NULL)) != PLAYLIST_RESULT_SUCCESS) {
+ if ((addToPlaylist(playlist, temp, NULL)) != PLAYLIST_RESULT_SUCCESS) {
/* for windows compatibility, convert slashes */
char *temp2 = g_strdup(temp);
char *p = temp2;
@@ -117,7 +117,7 @@ playlist_load_spl(const char *name_utf8)
*p = '/';
p++;
}
- if ((addToPlaylist(temp, NULL)) != PLAYLIST_RESULT_SUCCESS) {
+ if ((addToPlaylist(playlist, temp, NULL)) != PLAYLIST_RESULT_SUCCESS) {
g_warning("can't add file \"%s\"", temp2);
}
g_free(temp2);