X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=random_selector.c;h=4c803d8459f2059fba58a489d6fe72da9c26262d;hp=7bf34026941f8fcfa0553e26c69b3e66a7a5830e;hb=db0d7536fd2edfd506acc36428ccf2a48fa246f2;hpb=00c4b870186ea76be34858452c3400136cd6f78d diff --git a/random_selector.c b/random_selector.c index 7bf34026..4c803d84 100644 --- a/random_selector.c +++ b/random_selector.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2006 Andre Noll + * Copyright (C) 2004-2007 Andre Noll * * 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 "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; @@ -48,23 +48,7 @@ static int remember_file(const char *dir, const char *name) 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"); @@ -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); - 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;