X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=40228be515678effb04587f61d0fbc75acbc44c1;hp=79f47e5a3d20801832d5ad396bbd5b3b98aeed08;hb=cd7fb29f0d29504daf4d97a37344d97e42de81e2;hpb=f6a845d497ed6883e8318acc8a17d2ed07b85a51

diff --git a/mood.c b/mood.c
index 79f47e5a..40228be5 100644
--- a/mood.c
+++ b/mood.c
@@ -8,6 +8,7 @@
 
 #include <regex.h>
 #include <osl.h>
+#include <lopsub.h>
 
 #include "para.h"
 #include "error.h"
@@ -15,11 +16,8 @@
 #include "afh.h"
 #include "afs.h"
 #include "list.h"
-#include "ipc.h"
 #include "mm.h"
-#include "sideband.h"
 #include "mood.h"
-#include "sched.h"
 
 /**
  * Contains statistical data of the currently admissible audio files.
@@ -58,15 +56,13 @@ struct mood_item {
 	struct list_head mood_item_node;
 };
 
-/**
- * Created from the mood definition by mood_open().
+/*
+ * Created from the mood definition by \ref change_current_mood().
  *
  * When a mood is opened, each line of its definition is investigated, and a
- * corresponding mood item is produced. Each mood line starts with \p accept,
- * \p deny, or \p score which determines the type of the mood line.  For each
- * such type a linked list is maintained whose entries are the mood items.
- *
- * \sa mood_item, mood_open().
+ * corresponding mood item is produced. Each mood line starts with accept,
+ * deny, or score which determines the type of the mood line. For each such
+ * type a linked list is maintained whose entries are the mood items.
  */
 struct mood {
 	/** The name of this mood. */
@@ -81,7 +77,7 @@ struct mood {
 
 /*
  * If current_mood is NULL then no mood is currently open. If
- * current_mood->name is NULL, the dummy mood is currently open
+ * current_mood->name is NULL, the dummy mood is currently open.
  */
 static struct mood *current_mood;
 
@@ -141,8 +137,8 @@ static bool get_item_score(struct mood_item *item, const struct afs_info *afsi,
 }
 
 /* returns 1 if row admissible, 0 if not, negative on errors */
-static int compute_mood_score(const struct osl_row *aft_row, struct mood *m,
-		long *result)
+static int row_is_admissible(const struct osl_row *aft_row, struct mood *m,
+		long *scorep)
 {
 	struct mood_item *item;
 	int ret;
@@ -155,13 +151,13 @@ static int compute_mood_score(const struct osl_row *aft_row, struct mood *m,
 	if (!m)
 		return -E_NO_MOOD;
 	ret = get_afsi_of_row(aft_row, &afsi);
-	if (ret< 0)
+	if (ret < 0)
 		return ret;
 	ret = get_afhi_of_row(aft_row, &afhi);
-	if (ret< 0)
+	if (ret < 0)
 		return ret;
 	ret = get_audio_file_path_of_row(aft_row, &path);
-	if (ret< 0)
+	if (ret < 0)
 		return ret;
 	/* reject audio file if it matches any entry in the deny list */
 	list_for_each_entry(item, &m->deny_list, mood_item_node) {
@@ -191,7 +187,7 @@ static int compute_mood_score(const struct osl_row *aft_row, struct mood *m,
 	}
 	if (score_arg_sum)
 		score /= score_arg_sum;
-	*result = score;
+	*scorep = score;
 	return 1;
 }
 
@@ -258,7 +254,6 @@ struct mood_line_parser_data {
  * <score> is either an integer or "random" which assigns a random score to
  * all matching files
  */
-
 static int parse_mood_line(char *mood_line, void *data)
 {
 	struct mood_line_parser_data *mlpd = data;
@@ -365,9 +360,7 @@ success:
 	ret = 1;
 out:
 	free_argv(argv);
-	if (ret >= 0)
-		return ret;
-	if (mi) {
+	if (mi && (ret < 0 || !mlpd->m)) { /* mi was not added to any list */
 		free(mi->parser_data);
 		free(mi);
 	}
@@ -523,9 +516,7 @@ static int del_afs_statistics(const struct osl_row *row)
 	return 1;
 }
 
-/**
- * Structure used during mood_open().
- *
+/*
  * At mood open time we determine the set of admissible files for the given
  * mood. The mood score of each admissible file is computed by adding up all
  * mood item scores. Next, we update the afs statistics and append a struct
@@ -536,8 +527,6 @@ static int del_afs_statistics(const struct osl_row *row)
  * the afs_statistics and the current time) to the mood score. Finally, all
  * audio files in the temporary array are added to the score table and the
  * array is freed.
- *
- * \sa mood_method, admissible_array.
  */
 struct admissible_file_info
 {
@@ -571,7 +560,7 @@ static int add_if_admissible(struct osl_row *aft_row, void *data)
 	int ret;
 	long score = 0;
 
-	ret = compute_mood_score(aft_row, aa->m, &score);
+	ret = row_is_admissible(aft_row, aa->m, &score);
 	if (ret <= 0)
 		return ret;
 	if (statistics.num >= aa->size) {
@@ -630,7 +619,8 @@ _static_inline_ int64_t update_quadratic_deviation(int64_t n, int64_t old_qd,
 	return old_qd + delta * (sigma - 2 * old_sum / n - delta / n);
 }
 
-static int update_afs_statistics(struct afs_info *old_afsi, struct afs_info *new_afsi)
+static int update_afs_statistics(struct afs_info *old_afsi,
+		struct afs_info *new_afsi)
 {
 	unsigned n;
 	int ret = get_num_admissible_files(&n);
@@ -678,7 +668,7 @@ static int delete_from_statistics_and_score_table(const struct osl_row *aft_row)
  *
  * \return Positive on success, negative on errors.
  *
- * \sa score_delete().
+ * \sa \ref score_delete().
  */
 static int mood_delete_audio_file(const struct osl_row *aft_row)
 {
@@ -717,7 +707,7 @@ static int mood_update_audio_file(const struct osl_row *aft_row,
 	if (ret < 0)
 		return ret;
 	was_admissible = ret;
-	ret = compute_mood_score(aft_row, current_mood, &score);
+	ret = row_is_admissible(aft_row, current_mood, &score);
 	if (ret < 0)
 		return ret;
 	is_admissible = (ret > 0);
@@ -781,8 +771,7 @@ static void log_statistics(void)
 /**
  * Close the current mood.
  *
- * Free all resources of the current mood which were allocated during
- * mood_open().
+ * Frees all resources of the current mood.
  */
 void close_current_mood(void)
 {
@@ -804,8 +793,7 @@ void close_current_mood(void)
  * \return Positive on success, negative on errors. Loading the dummy mood
  * always succeeds.
  *
- * \sa struct admissible_file_info, struct admissible_array, struct
- * afs_info::last_played, mood_close().
+ * \sa struct \ref afs_info::last_played.
  */
 int change_current_mood(const char *mood_name)
 {
@@ -853,18 +841,15 @@ out:
 	free(aa.array);
 	return ret;
 }
-/**
+
+/*
  * Close and re-open the current mood.
  *
- * This function is used if changes to the audio file table or the
- * attribute table were made that render the current list of admissible
- * files useless. For example, if an attribute is removed from the
- * attribute table, this function is called.
- *
- * \return Positive on success, negative on errors. If no mood is currently
- * open, the function returns success.
+ * This function is called on events which render the current list of
+ * admissible files useless, for example if an attribute is removed from the
+ * attribute table.
  *
- * \sa mood_open(), mood_close().
+ * If no mood is currently open, the function returns success.
  */
 static int reload_current_mood(void)
 {