Merge the new afs code.

[paraslash.git] / playlist_selector.c

diff --git a/playlist_selector.c b/playlist_selector.c
index a497ec13f6919e28a9c2174a069ff9fe3ef84b2b..8372dacc342def63b740032a0a5826bd49531731 100644 (file)
--- a/playlist_selector.c
+++ b/playlist_selector.c
@@ -53,7 +53,7 @@ static struct audio_file_selector *self;
 
 extern struct misc_meta_data *mmd;
 
-static void playlist_add(char *path)
+static int playlist_add(char *path, __a_unused void *data)
 {
        if (playlist_len >= playlist_size) {
                playlist_size = 2 * playlist_size + 1;
@@ -61,6 +61,7 @@ static void playlist_add(char *path)
        }
        PARA_DEBUG_LOG("adding #%d/%d: %s\n", playlist_len, playlist_size, path);
        playlist[playlist_len++] = para_strdup(path);
+       return 1;
 }
 
 static int send_playlist_to_server(const char *buf, size_t size)
@@ -212,7 +213,7 @@ static void pls_post_select(__a_unused fd_set *rfds, __a_unused fd_set *wfds)
                goto out;
        }
        PARA_DEBUG_LOG("loading new playlist (%zd bytes)\n", pcd->size);
-       ret = for_each_line((char *)shm, pcd->size, &playlist_add);
+       ret = for_each_line((char *)shm, pcd->size, &playlist_add, NULL);
        shm_detach(shm);
        PARA_NOTICE_LOG("new playlist (%d entries)\n", playlist_len);
        sprintf(mmd->selector_info, "dbinfo1:new playlist: %d files\n"