.ico Version of the fancy new logo.

[paraslash.git] / playlist_selector.c

diff --git a/playlist_selector.c b/playlist_selector.c
index d1149269b9312e512a5148b034b6c2f0e4704ce8..6a74a922b65f1a026fa46df52f733732b31b100a 100644 (file)
--- a/playlist_selector.c
+++ b/playlist_selector.c
@@ -6,12 +6,16 @@
 
 /** \file playlist_selector.c The playlist audio file selector of paraslash  */
 
 
 /** \file playlist_selector.c The playlist audio file selector of paraslash  */
 

+#include <signal.h>
+#include "para.h"
+#include "afh.h"

 #include "server.h"
 #include "server.h"

-#include "afs.h"
+#include "afs_common.h"

 #include "error.h"
 #include "net.h"
 #include "string.h"
 #include "ipc.h"
 #include "error.h"
 #include "net.h"
 #include "string.h"
 #include "ipc.h"

+#include "list.h"

 #include "user_list.h"
 #include "playlist_selector_command_list.h"
 
 #include "user_list.h"
 #include "playlist_selector_command_list.h"
 


@@ -53,7 +57,7 @@ static struct audio_file_selector *self;
 
 extern struct misc_meta_data *mmd;
 
 
 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;
 {
        if (playlist_len >= playlist_size) {
                playlist_size = 2 * playlist_size + 1;


@@ -61,6 +65,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);
        }
        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)
 }
 
 static int send_playlist_to_server(const char *buf, size_t size)


@@ -106,7 +111,7 @@ out:
        return ret;
 }
 
        return ret;
 }
 

-int com_lpl(int fd, __a_unused int argc, __a_unused char *argv[])
+int com_lpl(int fd, __a_unused int argc, __a_unused char * const * const argv)

 {
        unsigned loaded = 0;
        size_t bufsize = 4096; /* guess that's enough */
 {
        unsigned loaded = 0;
        size_t bufsize = 4096; /* guess that's enough */


@@ -137,7 +142,7 @@ out:
        return ret;
 }
 
        return ret;
 }
 

-int com_ppl(int fd, __a_unused int argc, __a_unused char *argv[])
+int com_ppl(int fd, __a_unused int argc, __a_unused char * const * const argv)

 {
        unsigned i;
 
 {
        unsigned i;
 


@@ -212,7 +217,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);
                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"
        shm_detach(shm);
        PARA_NOTICE_LOG("new playlist (%d entries)\n", playlist_len);
        sprintf(mmd->selector_info, "dbinfo1:new playlist: %d files\n"