X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=random_selector.c;h=bef1b7fdb96bdcd0e35c540f9c82d0c179929590;hp=3bd637d54d47edb62f217b2831c3588cc508c7ca;hb=434b32087a9e2d54ca88072ca798a703a2ff629f;hpb=06fe0b6df77cf854d8f787a47b5c3d82d43dc111

diff --git a/random_selector.c b/random_selector.c
index 3bd637d5..bef1b7fd 100644
--- a/random_selector.c
+++ b/random_selector.c
@@ -1,19 +1,7 @@
 /*
- * 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
- *     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 random_selector.c An audio file selector which chooses files by random */
@@ -21,13 +9,12 @@
 #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;
@@ -41,30 +28,15 @@ static int count_audio_files(__a_unused const char *dir, __a_unused const char *
 
 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");
@@ -122,7 +94,7 @@ out:
 	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,
@@ -138,21 +110,24 @@ static void random_shutdown(void)
 }
 
 /**
- *  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
  */
 int random_selector_init(struct audio_file_selector *s)
 {
 	struct timeval now;
+	unsigned int seed;
 
 	PARA_INFO_LOG("%s", "registering random handlers ;)\n");
 	gettimeofday(&now, NULL);
-	srand(now.tv_usec);
-	s->cmd_list = cmds;
+	seed = now.tv_usec;
+	srand(seed);
+	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;