X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=d24eac912161f5d51c27ea020c08fccddb2f066a;hp=26d68dc558512380f20f0f45990b268614118381;hb=ca6c4e2908b578c17e621292dd204256697c2f8c;hpb=aef566e9c8680629bac1ea84893b8b3ccd13da77

diff --git a/mood.c b/mood.c
index 26d68dc5..d24eac91 100644
--- a/mood.c
+++ b/mood.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -35,7 +35,7 @@ struct afs_statistics {
 	/** Number of admissible files */
 	unsigned num;
 };
-struct afs_statistics statistics;
+static struct afs_statistics statistics;
 
 /**
  * Each line of the current mood corresponds to a mood_item.
@@ -107,28 +107,17 @@ static uint64_t int_sqrt(uint64_t x)
 	return res;
 }
 
-/* returns 1 if row matches score item, 0 if not, negative on errors */
-static int get_item_score(const struct osl_row *row, struct mood_item *item,
-		long *score, long *score_arg_sum)
+/* returns 1 if row matches score item, 0 if not. */
+static int get_item_score(struct mood_item *item, const struct afs_info *afsi,
+		const struct afh_info *afhi, const char *path, long *score,
+		long *score_arg_sum)
 {
-	struct afs_info afsi;
-	struct afh_info afhi;
-	char *path;
 	int ret, match = 1;
 
 	*score_arg_sum += item->random_score? 100 : PARA_ABS(item->score_arg);
 	ret = 100;
 	if (item->method) {
-		ret = get_afsi_of_row(row, &afsi);
-		if (ret< 0)
-			return ret;
-		ret = get_afhi_of_row(row, &afhi);
-		if (ret< 0)
-			return ret;
-		ret = get_audio_file_path_of_row(row, &path);
-		if (ret< 0)
-			return ret;
-		ret = item->method->score_function(path, &afsi, &afhi,
+		ret = item->method->score_function(path, afsi, afhi,
 			item->parser_data);
 		if ((ret < 0 && !item->logical_not) || (ret >= 0 && item->logical_not))
 			match = 0; /* no match */
@@ -147,24 +136,32 @@ static int compute_mood_score(const struct osl_row *aft_row, struct mood *m,
 	struct mood_item *item;
 	int ret, match = 0;
 	long score_arg_sum = 0, score = 0, item_score;
+	struct afs_info afsi;
+	struct afh_info afhi;
+	char *path;
 
 	if (!m)
 		return -E_NO_MOOD;
+	ret = get_afsi_of_row(aft_row, &afsi);
+	if (ret< 0)
+		return ret;
+	ret = get_afhi_of_row(aft_row, &afhi);
+	if (ret< 0)
+		return ret;
+	ret = get_audio_file_path_of_row(aft_row, &path);
+	if (ret< 0)
+		return ret;
 	/* reject audio file if it matches any entry in the deny list */
 	list_for_each_entry(item, &m->deny_list, mood_item_node) {
-		ret = get_item_score(aft_row, item, &item_score,
+		ret = get_item_score(item, &afsi, &afhi, path, &item_score,
 			&score_arg_sum);
-		if (ret < 0)
-			return ret;
 		if (ret > 0) /* not admissible */
 			return 0;
 		score += item_score;
 	}
 	list_for_each_entry(item, &m->accept_list, mood_item_node) {
-		ret = get_item_score(aft_row, item, &item_score,
+		ret = get_item_score(item, &afsi, &afhi, path, &item_score,
 			&score_arg_sum);
-		if (ret < 0)
-			return ret;
 		if (ret == 0)
 			continue;
 		match = 1;
@@ -174,10 +171,8 @@ static int compute_mood_score(const struct osl_row *aft_row, struct mood *m,
 	if (!match && !list_empty(&m->accept_list))
 		return 0;
 	list_for_each_entry(item, &m->score_list, mood_item_node) {
-		ret = get_item_score(aft_row, item, &item_score,
+		ret = get_item_score(item, &afsi, &afhi, path, &item_score,
 			&score_arg_sum);
-		if (ret < 0)
-			return ret;
 		score += item_score;
 	}
 	if (score_arg_sum)
@@ -878,7 +873,7 @@ out:
  *
  * \sa mood_open(), mood_close().
  */
-int reload_current_mood(void)
+static int reload_current_mood(void)
 {
 	int ret;
 	char *mood_name = NULL;
@@ -898,7 +893,9 @@ int reload_current_mood(void)
 int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb,
 		void *data)
 {
-	switch(event) {
+	if (!current_mood)
+		return 0;
+	switch (event) {
 	/*
 	 * The three blob events might change the set of admissible files,
 	 * so we must reload the score list.