Rename struct audio_format_info to afh_info.

[paraslash.git] / mood.c

diff --git a/mood.c b/mood.c
index 46337f28f3f42145c54b6fbed34c8088b16e2222..77b4a7361554fa05ca36f7685114c2bd1b7ba68c 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -47,7 +47,7 @@ struct afs_statistics statistics;
  * \sa struct mood_method, mood_parser.
  */
 typedef int mood_score_function(const char *path, const struct afs_info *afsi,
-               const struct audio_format_info *afhi, const void *data);
+               const struct afh_info *afhi, const void *data);
 
 /**
  * Pre-process a mood line.
@@ -172,7 +172,7 @@ static int mm_no_attributes_set_parser(const char *arg, __a_unused void **ignore
 
 static int mm_no_attributes_set_score_function(__a_unused const char *path,
                const struct afs_info *afsi,
-               __a_unused const struct audio_format_info *afhi,
+               __a_unused const struct afh_info *afhi,
                __a_unused const void *data)
 {
        if (!afsi->attributes)
@@ -182,7 +182,7 @@ static int mm_no_attributes_set_score_function(__a_unused const char *path,
 
 static int mm_played_rarely_score_function(__a_unused const char *path,
                const struct afs_info *afsi,
-               __a_unused const struct audio_format_info *afhi,
+               __a_unused const struct afh_info *afhi,
                __a_unused const void *data)
 {
        unsigned num;
@@ -205,7 +205,7 @@ static int mm_played_rarely_parser(const char *arg, __a_unused void **ignored)
 
 static int mm_name_like_score_function(const char *path,
                __a_unused const struct afs_info *afsi,
-               __a_unused const struct audio_format_info *afhi,
+               __a_unused const struct afh_info *afhi,
                const void *data)
 {
        if (fnmatch(data, path, 0))
@@ -238,7 +238,7 @@ static int mm_is_set_parser(const char *arg, void **bitnum)
 
 static int mm_is_set_score_function(__a_unused const char *path,
                __a_unused const struct afs_info *afsi,
-               __a_unused const struct audio_format_info *afhi,
+               __a_unused const struct afh_info *afhi,
                const void *data)
 {
        const unsigned char *bn = data;
@@ -252,7 +252,7 @@ static int add_item_score(const struct osl_row *row, struct mood_item *item, lon
                long *score_arg_sum)
 {
        struct afs_info afsi;
-       struct audio_format_info afhi;
+       struct afh_info afhi;
        char *path;
        int ret;
 
@@ -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,10 +903,10 @@ 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));
 }
@@ -972,20 +971,19 @@ int change_current_mood(char *mood_name)
                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");
+       PARA_NOTICE_LOG("loaded mood %s\n", current_mood->name);
        ret = statistics.num;
 out:
        free(aa.array);