make the random selector use command_util.sh

diff --git a/Makefile.in b/Makefile.in
index 45dc04182cb33fe585d3be15241dd335f85cb830..87569955ddb5c835af72bebb1d82b39902e2f674 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -170,6 +170,17 @@ mysql_selector_command_list.h: mysql_selector.cmd
        echo 'extern struct server_command cmds[];' > $@
        ./command_util.sh proto < $< >> $@
 
        echo 'extern struct server_command cmds[];' > $@
        ./command_util.sh proto < $< >> $@
 

+random_selector_command_list.c: random_selector.cmd random_selector_command_list.h
+       echo '#include "server.h"' > $@
+       echo '#include "user_list.h"' >> $@
+       echo '#include "random_selector_command_list.h"' >> $@
+       echo 'struct server_command random_selector_cmds[] = {' >>$@
+       ./command_util.sh array < $< >>$@
+       echo '{.name = NULL}};' >> $@
+random_selector_command_list.h: random_selector.cmd
+       echo 'extern struct server_command random_selector_cmds[];' > $@
+       ./command_util.sh proto < $< >> $@
+

 ortp_recv.o: ortp_recv.c
        $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<
 
 ortp_recv.o: ortp_recv.c
        $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<
 

diff --git a/configure.ac b/configure.ac
index f0c04442bf3e329c402b0b105a1d507fa8fedcce..c6797cbfb09067c8937e519a4af346fc24c5a069 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,7 @@ audiod_errlist_objs="audiod signal string daemon stat net
 audiod_ldflags=""
 audiod_audio_formats=""
 
 audiod_ldflags=""
 audiod_audio_formats=""
 

-server_cmdline_objs="server.cmdline server_command_list"
+server_cmdline_objs="server.cmdline server_command_list random_selector_command_list"

 server_errlist_objs="server mp3_afh vss command net string signal random_selector
        time daemon stat crypt http_send db close_on_fork playlist_selector
        ipc dccp dccp_send fd user_list"
 server_errlist_objs="server mp3_afh vss command net string signal random_selector
        time daemon stat crypt http_send db close_on_fork playlist_selector
        ipc dccp dccp_send fd user_list"

diff --git a/random_selector.c b/random_selector.c
index 7bf34026941f8fcfa0553e26c69b3e66a7a5830e..4c803d8459f2059fba58a489d6fe72da9c26262d 100644 (file)
--- a/random_selector.c
+++ b/random_selector.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2004-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-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
  *
  *     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


@@ -25,8 +25,8 @@
 #include "error.h"
 #include "net.h"
 #include "string.h"
 #include "error.h"
 #include "net.h"
 #include "string.h"

+#include "random_selector_command_list.h"

 
 

-static int com_random_info(int, int, char **);

 extern struct misc_meta_data *mmd;
 
 static unsigned int num_audio_files, audio_file_count;
 extern struct misc_meta_data *mmd;
 
 static unsigned int num_audio_files, audio_file_count;


@@ -48,23 +48,7 @@ static int remember_file(const char *dir, const char *name)
        return 1;
 }
 
        return 1;
 }
 

-/* array of commands that are supported by this selector */
-static struct server_command cmds[] = {
-{
-.name = "random_info",
-.handler = com_random_info,
-.perms = 0,
-.description = "about the random audio file selector",
-.synopsis = "random_info",
-.help =
-
-"Select a random file under the given directory"
-}, {
-.name = NULL,
-}
-};
-
-static int com_random_info(int fd, __a_unused int argc, __a_unused char *argv[])
+int com_random_info(int fd, __a_unused int argc, __a_unused char *argv[])

 {
        return send_buffer(fd, "Don't use for huge directories as it is "
                "very inefficient in this case.\n");
 {
        return send_buffer(fd, "Don't use for huge directories as it is "
                "very inefficient in this case.\n");


@@ -152,7 +136,7 @@ int random_selector_init(struct audio_file_selector *s)
        PARA_INFO_LOG("%s", "registering random handlers ;)\n");
        gettimeofday(&now, NULL);
        srand(now.tv_usec);
        PARA_INFO_LOG("%s", "registering random handlers ;)\n");
        gettimeofday(&now, NULL);
        srand(now.tv_usec);

-       s->cmd_list = cmds;
+       s->cmd_list = random_selector_cmds;

        s->get_audio_file_list = random_get_audio_file_list;
        s->shutdown = random_shutdown;
        s->update_audio_file = random_update_audio_file;
        s->get_audio_file_list = random_get_audio_file_list;
        s->shutdown = random_shutdown;
        s->update_audio_file = random_update_audio_file;