From: Andre <maan@p133.(none)>
Date: Sat, 13 May 2006 22:06:02 +0000 (+0200)
Subject: improved info text for the random selector.
X-Git-Tag: v0.2.14~118
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=06fe0b6df77cf854d8f787a47b5c3d82d43dc111;p=paraslash.git

improved info text for the random selector.

It now reports random_dir, the dir of the current audio file and
the number of audio files found in random_dir.
---

diff --git a/random_selector.c b/random_selector.c
index ec1f5c6c..3bd637d5 100644
--- a/random_selector.c
+++ b/random_selector.c
@@ -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;
 }