loglevel adjustments.
[paraslash.git] / mood.c
diff --git a/mood.c b/mood.c
index fd82ba4..ce5c1c7 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -518,7 +518,6 @@ static int load_mood(const struct osl_row *mood_row, struct mood **m)
                destroy_mood(mlpd.m);
                return ret;
        }
-       PARA_INFO_LOG("loaded mood %s\n", mlpd.m->name);
        *m = mlpd.m;
        return 1;
 }
@@ -904,14 +903,28 @@ static void log_statistics(void)
                PARA_NOTICE_LOG("no admissible files\n");
                return;
        }
-       PARA_NOTICE_LOG("last_played mean: %lli, last_played sigma: %llu\n",
+       PARA_INFO_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",
+       PARA_INFO_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));
 }
 
+/**
+ * Close the current mood.
+ *
+ * Free all resources of the current mood which were allocated during
+ * mood_open().
+ */
+void close_current_mood(void)
+{
+       destroy_mood(current_mood);
+       current_mood = NULL;
+       memset(&statistics, 0, sizeof(statistics));
+}
+
+
 /**
  * Change the current mood.
  *
@@ -951,46 +964,31 @@ int change_current_mood(char *mood_name)
                ret = load_mood(row, &m);
                if (ret < 0)
                        return ret;
-               destroy_mood(current_mood);
+               close_current_mood();
                current_mood = m;
        } else {
-               destroy_mood(current_mood);
+               close_current_mood();
                current_mood = alloc_new_mood("dummy");
        }
        aa.m = current_mood;
-       PARA_NOTICE_LOG("loaded mood %s\n", current_mood->name);
-       PARA_INFO_LOG("%s\n", "computing statistics of admissible files");
+       PARA_NOTICE_LOG("computing statistics of admissible files\n");
        ret = audio_file_loop(&aa, add_if_admissible);
        if (ret < 0)
                return ret;
        log_statistics();
-       PARA_NOTICE_LOG("%d admissible files \n", statistics.num);
+       PARA_INFO_LOG("%d admissible files \n", statistics.num);
        for (i = 0; i < statistics.num; i++) {
                struct admissible_file_info *a = aa.array + i;
                ret = add_to_score_table(a->aft_row, a->score);
                if (ret < 0)
                        goto out;
        }
-       PARA_NOTICE_LOG("score add complete\n");
-       ret = 1;
+       PARA_NOTICE_LOG("loaded mood %s\n", current_mood->name);
+       ret = statistics.num;
 out:
        free(aa.array);
        return ret;
 }
-
-/**
- * Close the current mood.
- *
- * Free all resources of the current mood which were allocated during
- * mood_open().
- */
-static void close_current_mood(void)
-{
-       destroy_mood(current_mood);
-       current_mood = NULL;
-       memset(&statistics, 0, sizeof(statistics));
-}
-
 /**
  * Close and re-open the current mood.
  *
@@ -1015,15 +1013,12 @@ int reload_current_mood(void)
        if (current_mood->name)
                mood_name = para_strdup(current_mood->name);
        close_current_mood();
-       ret = clear_score_table();
-       if (ret < 0)
-               return ret;
        ret = change_current_mood(mood_name);
        free(mood_name);
        return ret;
 }
 
-int moods_event_handler(enum afs_events event, struct para_buffer *pb,
+int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb,
                void *data)
 {
        switch(event) {