X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=8e6a7665f15e32bc5774c5539358ccaf0bcbc880;hp=74b00d35b2ddc4efd07f2e8783d1a37fcc3117b4;hb=1565acea5e9fe7413831c3a49032f35f721de608;hpb=ff47d38b16a15f57ac8804ae599c8d020de8b2f3

diff --git a/mood.c b/mood.c
index 74b00d35..8e6a7665 100644
--- a/mood.c
+++ b/mood.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -386,7 +386,7 @@ static int load_mood(const struct osl_row *mood_row, struct mood **m)
 	if (!*mood_name)
 		return -E_DUMMY_ROW;
 	mlpd.m = alloc_new_mood(mood_name);
-	ret = for_each_line_ro(mood_def.data, mood_def.size,
+	ret = for_each_line(FELF_READ_ONLY, mood_def.data, mood_def.size,
 		parse_mood_line, &mlpd);
 	osl_close_disk_object(&mood_def);
 	if (ret < 0) {
@@ -418,7 +418,7 @@ static int check_mood(struct osl_row *mood_row, void *data)
 	ret = para_printf(pb, "checking mood %s...\n", mood_name);
 	if (ret < 0)
 		goto out;
-	ret = for_each_line_ro(mood_def.data, mood_def.size,
+	ret = for_each_line(FELF_READ_ONLY, mood_def.data, mood_def.size,
 		parse_mood_line, &mlpd);
 	if (ret < 0)
 		para_printf(pb, "%s line %u: %s\n", mood_name, mlpd.line_num,
@@ -896,6 +896,9 @@ static int reload_current_mood(void)
 	int ret;
 	char *mood_name = NULL;
 
+	ret = clear_score_table();
+	if (ret < 0)
+		return ret;
 	if (!current_mood)
 		return 1;
 	PARA_NOTICE_LOG("reloading %s\n", current_mood->name?
@@ -918,12 +921,12 @@ static int reload_current_mood(void)
  * This function performs actions required due to the occurrence of the given
  * event. Possible actions include reload of the current mood and update of the
  * score of an audio file.
+ *
+ * \return Standard.
  */
 int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb,
 		void *data)
 {
-	int ret;
-
 	if (!current_mood)
 		return 0;
 	switch (event) {
@@ -936,10 +939,6 @@ int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb
 	case BLOB_ADD:
 		if (data == moods_table || data == playlists_table)
 			return 1; /* no reload necessary for these */
-		ret = clear_score_table();
-		if (ret < 0)
-			PARA_CRIT_LOG("clear score table returned %s\n",
-				para_strerror(-ret));
 		return reload_current_mood();
 	/* these also require reload of the score table */
 	case ATTRIBUTE_ADD: