X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=208bdc45ea5adf7d9c4ca67e505902d694718306;hp=940d72a17f9cbeb1d8dec42ea26cd9a821f9cbb3;hb=fd98a9eb785bb0809269bfc623ba16c452fb0c1a;hpb=904e302f0b64887f18c9e2fec7b0bb405675ad22

diff --git a/mood.c b/mood.c
index 940d72a1..208bdc45 100644
--- a/mood.c
+++ b/mood.c
@@ -8,6 +8,7 @@
 
 #include <regex.h>
 #include <osl.h>
+#include <lopsub.h>
 
 #include "para.h"
 #include "error.h"
@@ -141,8 +142,8 @@ static bool get_item_score(struct mood_item *item, const struct afs_info *afsi,
 }
 
 /* returns 1 if row admissible, 0 if not, negative on errors */
-static int compute_mood_score(const struct osl_row *aft_row, struct mood *m,
-		long *result)
+static int row_is_admissible(const struct osl_row *aft_row, struct mood *m,
+		long *scorep)
 {
 	struct mood_item *item;
 	int ret;
@@ -155,13 +156,13 @@ static int compute_mood_score(const struct osl_row *aft_row, struct mood *m,
 	if (!m)
 		return -E_NO_MOOD;
 	ret = get_afsi_of_row(aft_row, &afsi);
-	if (ret< 0)
+	if (ret < 0)
 		return ret;
 	ret = get_afhi_of_row(aft_row, &afhi);
-	if (ret< 0)
+	if (ret < 0)
 		return ret;
 	ret = get_audio_file_path_of_row(aft_row, &path);
-	if (ret< 0)
+	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) {
@@ -191,7 +192,7 @@ static int compute_mood_score(const struct osl_row *aft_row, struct mood *m,
 	}
 	if (score_arg_sum)
 		score /= score_arg_sum;
-	*result = score;
+	*scorep = score;
 	return 1;
 }
 
@@ -258,7 +259,6 @@ struct mood_line_parser_data {
  * <score> is either an integer or "random" which assigns a random score to
  * all matching files
  */
-
 static int parse_mood_line(char *mood_line, void *data)
 {
 	struct mood_line_parser_data *mlpd = data;
@@ -571,7 +571,7 @@ static int add_if_admissible(struct osl_row *aft_row, void *data)
 	int ret;
 	long score = 0;
 
-	ret = compute_mood_score(aft_row, aa->m, &score);
+	ret = row_is_admissible(aft_row, aa->m, &score);
 	if (ret <= 0)
 		return ret;
 	if (statistics.num >= aa->size) {
@@ -630,7 +630,8 @@ _static_inline_ int64_t update_quadratic_deviation(int64_t n, int64_t old_qd,
 	return old_qd + delta * (sigma - 2 * old_sum / n - delta / n);
 }
 
-static int update_afs_statistics(struct afs_info *old_afsi, struct afs_info *new_afsi)
+static int update_afs_statistics(struct afs_info *old_afsi,
+		struct afs_info *new_afsi)
 {
 	unsigned n;
 	int ret = get_num_admissible_files(&n);
@@ -717,7 +718,7 @@ static int mood_update_audio_file(const struct osl_row *aft_row,
 	if (ret < 0)
 		return ret;
 	was_admissible = ret;
-	ret = compute_mood_score(aft_row, current_mood, &score);
+	ret = row_is_admissible(aft_row, current_mood, &score);
 	if (ret < 0)
 		return ret;
 	is_admissible = (ret > 0);
@@ -747,7 +748,7 @@ static int mood_update_audio_file(const struct osl_row *aft_row,
 		percent = 100;
 	else if (percent < 0)
 		percent = 0;
-	PARA_DEBUG_LOG("moving from rank %u to %lu%%\n", rank, percent);
+	PARA_DEBUG_LOG("moving from rank %u to %li%%\n", rank, percent);
 	return score_update(aft_row, percent);
 }
 
@@ -853,6 +854,7 @@ out:
 	free(aa.array);
 	return ret;
 }
+
 /**
  * Close and re-open the current mood.
  *