X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=e5e8495369f1e7ffffe36bd463ec5aadf6163e39;hp=b1ee78e4e67faac76be61ee9c09085dfde20972f;hb=fb4022dfafa1d6f86f741767ecaed8e41c53352a;hpb=4cdf53ccaf94a774be3424763978c56b9bcaf0d1

diff --git a/mood.c b/mood.c
index b1ee78e4..e5e84953 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.
  */
@@ -17,6 +17,7 @@
 #include "list.h"
 #include "ipc.h"
 #include "mm.h"
+#include "sideband.h"
 
 /**
  * Contains statistical data of the currently admissible audio files.
@@ -76,6 +77,10 @@ struct mood {
 	struct list_head score_list;
 };
 
+/*
+ * If current_mood is NULL then no mood is currently open. If
+ * current_mood->name is NULL, the dummy mood is currently open
+ */
 static struct mood *current_mood;
 
 /**
@@ -217,7 +222,8 @@ static void destroy_mood(struct mood *m)
 static struct mood *alloc_new_mood(const char *name)
 {
 	struct mood *m = para_calloc(sizeof(struct mood));
-	m->name = para_strdup(name);
+	if (name)
+		m->name = para_strdup(name);
 	INIT_LIST_HEAD(&m->accept_list);
 	INIT_LIST_HEAD(&m->deny_list);
 	INIT_LIST_HEAD(&m->score_list);
@@ -380,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) {
@@ -412,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,
@@ -432,8 +438,11 @@ void mood_check_callback(int fd, __a_unused const struct osl_object *query)
 {
 	struct para_buffer pb = {
 		.max_size = shm_get_shmmax(),
-		.private_data = &fd,
-		.max_size_handler = pass_buffer_as_shm
+		.private_data = &(struct afs_max_size_handler_data) {
+			.fd = fd,
+			.band = SBD_OUTPUT
+		},
+		.max_size_handler = afs_max_size_handler
 	};
 
 	int ret = para_printf(&pb, "checking moods...\n");
@@ -442,7 +451,7 @@ void mood_check_callback(int fd, __a_unused const struct osl_object *query)
 	osl_rbtree_loop(moods_table, BLOBCOL_ID, &pb,
 		check_mood);
 	if (pb.offset)
-		pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
 	free(pb.buf);
 }
 
@@ -846,9 +855,9 @@ int change_current_mood(char *mood_name)
 			return ret;
 		close_current_mood();
 		current_mood = m;
-	} else {
+	} else { /* load dummy mood */
 		close_current_mood();
-		current_mood = alloc_new_mood("dummy");
+		current_mood = alloc_new_mood(NULL);
 	}
 	aa.m = current_mood;
 	PARA_NOTICE_LOG("computing statistics of admissible files\n");
@@ -863,7 +872,7 @@ int change_current_mood(char *mood_name)
 		if (ret < 0)
 			goto out;
 	}
-	PARA_NOTICE_LOG("loaded mood %s\n", current_mood->name);
+	PARA_NOTICE_LOG("loaded mood %s\n", mood_name? mood_name : "(dummy)");
 	ret = statistics.num;
 out:
 	free(aa.array);
@@ -909,6 +918,8 @@ 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)