X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=354ce3ca43cb7afe03349e7969153d7743814be3;hp=d12bc20d77554c58a77b5b2da3b4a608e5309f34;hb=f652ce6afe7f6fd0e42814505234cbf4321a736e;hpb=ec5040e2e7d3c82e93769b62335fab1e63b0f07c

diff --git a/mood.c b/mood.c
index d12bc20d..354ce3ca 100644
--- a/mood.c
+++ b/mood.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -17,6 +17,7 @@
 #include "list.h"
 #include "ipc.h"
 #include "mm.h"
+#include "sideband.h"
 
 /**
  * Contains statistical data of the currently admissible audio files.
@@ -107,12 +108,16 @@ __a_const static uint64_t int_sqrt(uint64_t x)
 	return res;
 }
 
-/* returns 1 if row matches score item, 0 if not. */
-static int get_item_score(struct mood_item *item, const struct afs_info *afsi,
+/*
+ * Returns true if row matches, false if it does not match. In any case score
+ * and score_arg_sum are set/increased accordingly.
+ */
+static bool 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)
 {
-	int ret, match = 1;
+	int ret;
+	bool match = true;
 
 	*score_arg_sum += item->random_score? 100 : PARA_ABS(item->score_arg);
 	ret = 100;
@@ -120,7 +125,7 @@ static int get_item_score(struct mood_item *item, const struct afs_info *afsi,
 		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 */
+			match = false;
 	}
 	if (item->random_score)
 		*score = PARA_ABS(ret) * para_random(100);
@@ -134,7 +139,8 @@ static int compute_mood_score(const struct osl_row *aft_row, struct mood *m,
 		long *result)
 {
 	struct mood_item *item;
-	int ret, match = 0;
+	int ret;
+	bool match;
 	long score_arg_sum = 0, score = 0, item_score;
 	struct afs_info afsi;
 	struct afh_info afhi;
@@ -153,29 +159,29 @@ static int compute_mood_score(const struct osl_row *aft_row, struct mood *m,
 		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(item, &afsi, &afhi, path, &item_score,
+		match = get_item_score(item, &afsi, &afhi, path, &item_score,
 			&score_arg_sum);
-		if (ret > 0) /* not admissible */
+		if (match) /* not admissible */
 			return 0;
 		score += item_score;
 	}
+	match = false;
 	list_for_each_entry(item, &m->accept_list, mood_item_node) {
 		ret = get_item_score(item, &afsi, &afhi, path, &item_score,
 			&score_arg_sum);
 		if (ret == 0)
 			continue;
-		match = 1;
+		match = true;
 		score += item_score;
 	}
 	/* reject if there is no matching entry in the accept list */
 	if (!match && !list_empty(&m->accept_list))
 		return 0;
 	list_for_each_entry(item, &m->score_list, mood_item_node) {
-		ret = get_item_score(item, &afsi, &afhi, path, &item_score,
+		match = get_item_score(item, &afsi, &afhi, path, &item_score,
 			&score_arg_sum);
-		if (ret == 0)
-			continue;
-		score += item_score;
+		if (match)
+			score += item_score;
 	}
 	if (score_arg_sum)
 		score /= score_arg_sum;
@@ -427,8 +433,11 @@ void mood_check_callback(int fd, __a_unused const struct osl_object *query)
 {
 	struct para_buffer pb = {
 		.max_size = shm_get_shmmax(),
-		.private_data = &fd,
-		.max_size_handler = pass_buffer_as_shm
+		.private_data = &(struct afs_max_size_handler_data) {
+			.fd = fd,
+			.band = SBD_OUTPUT
+		},
+		.max_size_handler = afs_max_size_handler
 	};
 
 	int ret = para_printf(&pb, "checking moods...\n");
@@ -437,7 +446,7 @@ void mood_check_callback(int fd, __a_unused const struct osl_object *query)
 	osl_rbtree_loop(moods_table, BLOBCOL_ID, &pb,
 		check_mood);
 	if (pb.offset)
-		pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
 	free(pb.buf);
 }