mood.c: Add GPL header.

[paraslash.git] / mood.c

diff --git a/mood.c b/mood.c
index 996b71fac99257758e2a5d8cad9d6c018cf1ba06..f7cb81db7372359c11206b4f880dd2568fb9125a 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ *
+ * Licensed under the GPL v2. For licencing details see COPYING.
+ */
+
+/** \file mood.c Paraslash's mood handling functions. */
+
 #include "para.h"
 #include "error.h"
 #include "afh.h"
@@ -5,8 +13,6 @@
 #include "list.h"
 #include "string.h"
 
-/** \file mood.c Paraslash's mood handling functions. */
-
 /**
  * Contains statistical data of the currently admissible audio files.
  *
@@ -237,7 +243,7 @@ static int mm_is_set_score_function(const struct osl_row *row, void *bitnum)
 }
 
 /* returns 1 if row matches score item, -1 otherwise */
-static int add_item_score(const void *row, struct mood_item *item, long *score,
+static int add_item_score(const struct osl_row *row, struct mood_item *item, long *score,
                long *score_arg_sum)
 {
        int ret = 100;
@@ -255,7 +261,7 @@ static int add_item_score(const void *row, struct mood_item *item, long *score,
        return 1;
 }
 
-static int compute_mood_score(const void *row, long *result)
+static int compute_mood_score(const struct osl_row *row, long *result)
 {
        struct mood_item *item;
        int match = 0;
@@ -273,10 +279,8 @@ static int compute_mood_score(const void *row, long *result)
        /* reject if there is no matching entry in the accept list */
        if (!match && !list_empty(&current_mood->accept_list))
                return -E_NOT_ADMISSIBLE;
-       list_for_each_entry(item, &current_mood->score_list, mood_item_node) {
-               PARA_INFO_LOG("random: %d\n", para_random(100));
+       list_for_each_entry(item, &current_mood->score_list, mood_item_node)
                add_item_score(row, item, &score, &score_arg_sum);
-       }
        if (score_arg_sum)
                score /= score_arg_sum;
        *result = score;
@@ -471,7 +475,7 @@ out:
        return ret;
 }
 
-static int load_mood(const void *row)
+static int load_mood(const struct osl_row *row)
 {
        int ret;
        struct mood *new_mood, *old_mood = current_mood;
@@ -653,7 +657,7 @@ static int del_afs_statistics(const struct osl_row *row)
 struct admissible_file_info
 {
        /** The admissible audio file. */
-       void *aft_row;
+       struct osl_row *aft_row;
        /** Its score. */
        long score;
 };
@@ -842,13 +846,13 @@ int mood_update_audio_file(const struct osl_row *aft_row, struct afs_info *old_a
        score += compute_num_played_score(&afsi);
        score += compute_last_played_score(&afsi);
        score /= 3;
-       PARA_NOTICE_LOG("score: %li\n", score);
+       PARA_DEBUG_LOG("score: %li\n", score);
        percent = (score + 100) / 3;
        if (percent > 100)
                percent = 100;
        else if (percent < 0)
                percent = 0;
-       PARA_NOTICE_LOG("re-inserting at %lu%%\n", percent);
+       PARA_DEBUG_LOG("re-inserting at %lu%%\n", percent);
        return score_update(aft_row, percent);
 }
 
@@ -860,10 +864,12 @@ static void log_statistics(void)
                PARA_NOTICE_LOG("no admissible files\n");
                return;
        }
-       PARA_NOTICE_LOG("last_played mean: %lli, last_played sigma: %lli\n",
-               statistics.last_played_sum / n, int_sqrt(statistics.last_played_qd / n));
-       PARA_NOTICE_LOG("num_played mean: %lli, num_played sigma: %lli\n",
-               statistics.num_played_sum / n, int_sqrt(statistics.num_played_qd / n));
+       PARA_NOTICE_LOG("last_played mean: %lli, last_played sigma: %llu\n",
+               (long long int)(statistics.last_played_sum / n),
+               (long long unsigned)int_sqrt(statistics.last_played_qd / n));
+       PARA_NOTICE_LOG("num_played mean: %lli, num_played sigma: %llu\n",
+               (long long int)statistics.num_played_sum / n,
+               (long long unsigned)int_sqrt(statistics.num_played_qd / n));
 }
 
 /**