X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=0f907cc0d6ac204669400f0825d736cabbd06042;hp=a89ae85f4c102b6078ae1d76a0919e52b47af20c;hb=9a4a139a9c57420e1bd4b96000985cbfa841782d;hpb=d894e0cc7ce94d09847a8a35f47127968d4268f1

diff --git a/mood.c b/mood.c
index a89ae85f..0f907cc0 100644
--- 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;
@@ -203,9 +203,9 @@ static int mm_played_rarely_parser(const char *arg, __a_unused void **ignored)
 	return 1;
 }
 
-static int mm_name_like_score_function(const char *path,
+static int mm_path_matches_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))
@@ -213,13 +213,13 @@ static int mm_name_like_score_function(const char *path,
 	return 100;
 }
 
-static int mm_name_like_parser(const char *arg, void **data)
+static int mm_path_matches_parser(const char *arg, void **data)
 {
 	*data = para_strdup(arg);
 	return 1;
 }
 
-static void mm_name_like_cleanup(void *data)
+static void mm_path_matches_cleanup(void *data)
 {
 	free(data);
 }
@@ -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;
 
@@ -320,7 +320,7 @@ static const struct mood_method mood_methods[] = {
 	{DEFINE_MOOD_METHOD(no_attributes_set)},
 	{DEFINE_MOOD_METHOD(played_rarely)},
 	{DEFINE_MOOD_METHOD(is_set)},
-	{DEFINE_MOOD_METHOD_WITH_CLEANUP(name_like)},
+	{DEFINE_MOOD_METHOD_WITH_CLEANUP(path_matches)},
 	{.parser = NULL}
 };
 
@@ -372,8 +372,11 @@ enum mood_line_type {
 	ML_SCORE
 };
 
+/** Data passed to the parser of a mood line. */
 struct mood_line_parser_data {
+	/** The mood this mood line belongs to. */
 	struct mood *m;
+	/** The line number in the mood definition. */
 	unsigned line_num;
 };
 
@@ -419,11 +422,13 @@ static int parse_mood_line(char *mood_line, void *data)
 		w++;
 		if (!*w)
 			goto out;
-		if (!strcmp(*w, "with")) {
-			w++;
-			if (!*w)
-				goto out;
-		}
+		if (strcmp(*w, "with"))
+			goto check_for_if;
+		w++;
+		if (!*w)
+			goto out;
+		if (strcmp(*w, "score"))
+			goto out;
 	}
 	if (mlt == ML_SCORE || !strcmp(*w, "score")) {
 		ret = -E_MOOD_SYNTAX;
@@ -446,6 +451,7 @@ static int parse_mood_line(char *mood_line, void *data)
 	w++;
 	if (!*w)
 		goto out;
+check_for_if:
 	if (!strcmp(*w, "if")) {
 		ret = -E_MOOD_SYNTAX;
 		w++;
@@ -514,11 +520,10 @@ static int load_mood(const struct osl_row *mood_row, struct mood **m)
 	osl_close_disk_object(&mood_def);
 	if (ret < 0) {
 		PARA_ERROR_LOG("unable to load mood %s: %s\n", mlpd.m->name,
-			PARA_STRERROR(-ret));
+			para_strerror(-ret));
 		destroy_mood(mlpd.m);
 		return ret;
 	}
-	PARA_INFO_LOG("loaded mood %s\n", mlpd.m->name);
 	*m = mlpd.m;
 	return 1;
 }
@@ -543,7 +548,7 @@ static int check_mood(struct osl_row *mood_row, void *data)
 		parse_mood_line, &mlpd);
 	if (ret < 0)
 		para_printf(pb, "%s line %u: %s\n", mood_name, mlpd.line_num,
-			PARA_STRERROR(-ret));
+			para_strerror(-ret));
 out:
 	osl_close_disk_object(&mood_def);
 	return 1;
@@ -904,10 +909,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 +977,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);
@@ -1009,9 +1013,10 @@ int reload_current_mood(void)
 	int ret;
 	char *mood_name = NULL;
 
-	PARA_NOTICE_LOG("reloading current mood\n");
 	if (!current_mood)
 		return 1;
+	PARA_NOTICE_LOG("reloading %s\n", current_mood->name?
+		current_mood->name : "(dummy)");
 	if (current_mood->name)
 		mood_name = para_strdup(current_mood->name);
 	close_current_mood();
@@ -1020,7 +1025,7 @@ int reload_current_mood(void)
 	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) {