/*
- * 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
#include <sys/time.h> /* gettimeofday */
#include "server.cmdline.h"
#include "server.h"
-#include "db.h"
+#include "afs.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 gengetopt_args_info conf;
extern struct misc_meta_data *mmd;
static unsigned int num_audio_files, audio_file_count;
static int remember_file(const char *dir, const char *name)
{
- if (audio_file_count >= num_audio_files)
- return -E_FILE_COUNT;
- audio_file_list[audio_file_count] = make_message("%s/%s", dir, name);
- audio_file_count++;
+ if (audio_file_count < num_audio_files) {
+ audio_file_list[audio_file_count] =
+ make_message("%s/%s", dir, name);
+ audio_file_count++;
+ }
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 ret_list;
}
-void random_update_audio_file(char *audio_file)
+static void random_update_audio_file(char *audio_file)
{
char *dn = para_dirname(audio_file);
snprintf(mmd->selector_info, MMD_INFO_SIZE - 1,
}
/**
- * the init function for the random audio file selector
+ * the init function for the random audio file selector
+ *
+ * \param s pointer ro the struct to iniitalize
*
- * Init all function pointers of \a s, init the info text and seed the
- * PRNG.
+ * Init all function pointers of \a s, init the info text and seed the PRNG.
*
* \sa struct audio_file_selector, misc_meta_data::selector_info, mysql.c
*/
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;