X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=e60ef2fd6fc97cac81d65e32431749dab3c935eb;hp=74b00d35b2ddc4efd07f2e8783d1a37fcc3117b4;hb=5e9ded6843a720a4d234ba63143d14e05f4746b4;hpb=ff47d38b16a15f57ac8804ae599c8d020de8b2f3

diff --git a/mood.c b/mood.c
index 74b00d35..e60ef2fd 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.
  */
@@ -386,7 +386,7 @@ static int load_mood(const struct osl_row *mood_row, struct mood **m)
 	if (!*mood_name)
 		return -E_DUMMY_ROW;
 	mlpd.m = alloc_new_mood(mood_name);
-	ret = for_each_line_ro(mood_def.data, mood_def.size,
+	ret = for_each_line(FELF_READ_ONLY, mood_def.data, mood_def.size,
 		parse_mood_line, &mlpd);
 	osl_close_disk_object(&mood_def);
 	if (ret < 0) {
@@ -418,7 +418,7 @@ static int check_mood(struct osl_row *mood_row, void *data)
 	ret = para_printf(pb, "checking mood %s...\n", mood_name);
 	if (ret < 0)
 		goto out;
-	ret = for_each_line_ro(mood_def.data, mood_def.size,
+	ret = for_each_line(FELF_READ_ONLY, mood_def.data, mood_def.size,
 		parse_mood_line, &mlpd);
 	if (ret < 0)
 		para_printf(pb, "%s line %u: %s\n", mood_name, mlpd.line_num,
@@ -455,19 +455,6 @@ void mood_check_callback(int fd, __a_unused const struct osl_object *query)
 	free(pb.buf);
 }
 
-#if 0
-static unsigned int_log2(uint64_t x)
-{
-	unsigned res = 0;
-
-	while (x) {
-		x /= 2;
-		res++;
-	}
-	return res;
-}
-#endif
-
 static int64_t normalized_value(int64_t x, int64_t n, int64_t sum, int64_t qd)
 {
 	if (!n || !qd)
@@ -490,16 +477,10 @@ static long compute_last_played_score(struct afs_info *afsi)
 static long compute_dynamic_score(const struct osl_row *aft_row)
 {
 	struct afs_info afsi;
-	int64_t score, nscore = 0, lscore = 0;
-	int ret;
 
-	ret = get_afsi_of_row(aft_row, &afsi);
-	if (ret < 0)
+	if (get_afsi_of_row(aft_row, &afsi) < 0)
 		return -100;
-	nscore = compute_num_played_score(&afsi);
-	lscore = compute_last_played_score(&afsi);
-	score = nscore + lscore;
-	return score;
+	return compute_num_played_score(&afsi) + compute_last_played_score(&afsi);
 }
 
 static int add_afs_statistics(const struct osl_row *row)
@@ -918,6 +899,8 @@ static int reload_current_mood(void)
  * This function performs actions required due to the occurrence of the given
  * event. Possible actions include reload of the current mood and update of the
  * score of an audio file.
+ *
+ * \return Standard.
  */
 int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb,
 		void *data)