X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=94deff4684c5a335d38f5b843e22a4cee7dbc880;hp=a2525a78d627b789697253fcfe5b565ba8ef9fbe;hb=074b80bb23b8fa610464bd98dc4bc7dd2babc88a;hpb=bc15c3ff65eb00e04ebc303cfa9ee3d1a4675b35

diff --git a/mood.c b/mood.c
index a2525a78..94deff46 100644
--- a/mood.c
+++ b/mood.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2014 Andre Noll <maan@tuebingen.mpg.de>
+ * Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -30,7 +30,7 @@ struct afs_statistics {
 	int64_t num_played_sum;
 	/** Sum of last played times over all admissible files. */
 	int64_t last_played_sum;
-	/** Quadratic deviation of num played time. */
+	/** Quadratic deviation of num played count. */
 	int64_t num_played_qd;
 	/** Quadratic deviation of last played time. */
 	int64_t last_played_qd;
@@ -535,16 +535,16 @@ static int del_afs_statistics(const struct osl_row *row)
 /**
  * Structure used during mood_open().
  *
- * At mood open time, we look at each file in the audio file table in order to
- * determine whether it is admissible. If a file happens to be admissible, its
- * mood score is computed by calling each relevant mood_score_function. Next,
- * we update the afs_statistics and add a struct admissible_file_info to a
- * temporary array.
+ * At mood open time we determine the set of admissible files for the given
+ * mood. The mood score of each admissible file is computed by adding up all
+ * mood item scores. Next, we update the afs statistics and append a struct
+ * admissible_file_info to a temporary array.
  *
- * If all files have been processed that way, the final score of each
+ * When all files have been processed in this way, the final score of each
  * admissible file is computed by adding the dynamic score (which depends on
- * the afs_statistics) to the mood score.  Finally, all audio files in the
- * array are added to the score table and the admissible array is freed.
+ * the afs_statistics and the current time) to the mood score. Finally, all
+ * audio files in the temporary array are added to the score table and the
+ * array is freed.
  *
  * \sa mood_method, admissible_array.
  */
@@ -870,6 +870,9 @@ static int reload_current_mood(void)
 	int ret;
 	char *mood_name = NULL;
 
+	ret = clear_score_table();
+	if (ret < 0)
+		return ret;
 	if (!current_mood)
 		return 1;
 	PARA_NOTICE_LOG("reloading %s\n", current_mood->name?
@@ -898,8 +901,6 @@ static int reload_current_mood(void)
 int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb,
 		void *data)
 {
-	int ret;
-
 	if (!current_mood)
 		return 0;
 	switch (event) {
@@ -912,10 +913,6 @@ int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb
 	case BLOB_ADD:
 		if (data == moods_table || data == playlists_table)
 			return 1; /* no reload necessary for these */
-		ret = clear_score_table();
-		if (ret < 0)
-			PARA_CRIT_LOG("clear score table returned %s\n",
-				para_strerror(-ret));
 		return reload_current_mood();
 	/* these also require reload of the score table */
 	case ATTRIBUTE_ADD: