README,INSTALL: Fix some spelling errors.

[paraslash.git] / playlist_selector.c

diff --git a/playlist_selector.c b/playlist_selector.c
index 2b0599cb0dd9f05d6bb8ee747277956e87ddcee0..6866dafb56b98f437897feab2a7856512656af9b 100644 (file)
--- a/playlist_selector.c
+++ b/playlist_selector.c
@@ -1,29 +1,20 @@
 /*
  * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file playlist_selector.c The playlist audio file selector of paraslash  */
 
+#include "para.h"
+#include "afh.h"
 #include "server.h"
-#include "afs.h"
+#include "afs_common.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"
 
@@ -65,7 +56,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;
@@ -73,6 +64,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)
@@ -118,7 +110,7 @@ out:
        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 */
@@ -149,7 +141,7 @@ out:
        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;
 
@@ -224,7 +216,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"