X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=random_selector.c;h=7bf34026941f8fcfa0553e26c69b3e66a7a5830e;hp=ec1f5c6c53c39982cdf2ed488447598bcbfb59cd;hb=0c4a3b0f50cf6cdf21e13441b76b7bf963cd6876;hpb=a8a78f935dcefa8a7fcda8dae80bca64fe39d632

diff --git a/random_selector.c b/random_selector.c
index ec1f5c6c..7bf34026 100644
--- a/random_selector.c
+++ b/random_selector.c
@@ -27,7 +27,6 @@
 #include "string.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,10 +40,11 @@ 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;
 }
 
@@ -109,17 +109,30 @@ static char **random_get_audio_file_list(unsigned int num)
 			/ (RAND_MAX + 1.0)));
 		ret_list[i] = para_strdup(audio_file_list[r]);
 	}
+	ret = 1;
 out:
 	if (audio_file_list) {
 		for (i = 0; i < num_audio_files; i++)
 			free(audio_file_list[i]);
 		free(audio_file_list);
 	}
-//	if (ret < 0)
-//		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+	if (ret > 0) {
+	} else
+		sprintf(mmd->selector_info, "dbinfo1:%s\n", PARA_STRERROR(-ret));
 	return ret_list;
 }
 
+void random_update_audio_file(char *audio_file)
+{
+	char *dn = para_dirname(audio_file);
+	snprintf(mmd->selector_info, MMD_INFO_SIZE - 1,
+		"dbinfo1:current dir: %s\n"
+		"dbinfo2:random_dir: %s\n"
+		"dbinfo3:%d files available\n",
+		dn, conf.random_dir_arg, num_audio_files);
+	free(dn);
+	mmd->selector_info[MMD_INFO_SIZE - 1] = '\0';
+}
 static void random_shutdown(void)
 {
 }
@@ -127,22 +140,25 @@ static void random_shutdown(void)
 /**
  *  the init function for the random audio file selector
  *
- * Init all function pointers of \a db, init the info text and seed the
+ * 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 *db)
+int random_selector_init(struct audio_file_selector *s)
 {
 	struct timeval now;
 
 	PARA_INFO_LOG("%s", "registering random handlers ;)\n");
-	sprintf(mmd->selector_info, "dbinfo1:database info? You're kidding. "
-		"I'm still dopey!\ndbinfo2:\ndbinfo3:\n");
 	gettimeofday(&now, NULL);
 	srand(now.tv_usec);
-	db->cmd_list = cmds;
-	db->get_audio_file_list = random_get_audio_file_list;
-	db->shutdown = random_shutdown;
+	s->cmd_list = cmds;
+	s->get_audio_file_list = random_get_audio_file_list;
+	s->shutdown = random_shutdown;
+	s->update_audio_file = random_update_audio_file;
+	snprintf(mmd->selector_info, MMD_INFO_SIZE - 1,
+		"dbinfo1: Welcome to the random selector\n"
+		"dbinfo2: random_dir: %s\n", conf.random_dir_arg);
+	mmd->selector_info[MMD_INFO_SIZE - 1] = '\0';
 	return 1;
 }