X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=64925b76e6e6d3500186670ec5d4bf5e9f91dd08;hp=e0ca15ef8512376759099cfcd2cb83e5dda833e2;hb=c967924027fa0b94ebe2c6b28bc191578f7afaea;hpb=75feacbafa2a1fe258f85963205b8c28a976badc

diff --git a/audiod.c b/audiod.c
index e0ca15ef..64925b76 100644
--- a/audiod.c
+++ b/audiod.c
@@ -428,7 +428,7 @@ static void close_filters(struct slot_info *s)
 	struct audio_format_info *a = afi + s->format;
 	if (a->num_filters == 0)
 		return;
-	for (i = 0; i < a->num_filters; i++) {
+	for (i = a->num_filters - 1; i >= 0; i--) {
 		struct filter_node *fn = s->fns + i;
 		struct filter *f;
 
@@ -1216,21 +1216,21 @@ static int status_post_select(struct sched *s, struct task *t)
 			close_stat_pipe();
 			goto out;
 		}
-		if (st->ct->status != CL_RECEIVING)
+		if (st->ct->status != CL_EXECUTING)
 			goto out;
 		ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF);
 		if (ret <= 0) {
 			struct timeval diff;
 			tv_diff(now, &st->last_status_read, &diff);
 			if (diff.tv_sec > 61)
-				task_notify(&st->ct->task, E_AUDIOD_OFF);
+				task_notify(&st->ct->task, E_STATUS_TIMEOUT);
 			goto out;
 		}
 		btr_merge(st->btrn, st->min_iqs);
 		sz = btr_next_buffer(st->btrn, &buf);
 		ret = for_each_stat_item(buf, sz, update_item);
 		if (ret < 0) {
-			task_notify(&st->ct->task, E_AUDIOD_OFF);
+			task_notify(&st->ct->task, -ret);
 			goto out;
 		}
 		if (sz != ret) {
@@ -1301,17 +1301,17 @@ static void set_initial_status(void)
 
 __noreturn static void print_help_and_die(void)
 {
-	int d = conf.detailed_help_given;
-	const char **p = d? audiod_args_info_detailed_help
-		: audiod_args_info_help;
-
-	printf_or_die("%s\n\n", VERSION_SINGLE_LINE("audiod"));
-	printf_or_die("%s\n\n", audiod_args_info_usage);
-	for (; *p; p++)
-		printf_or_die("%s\n", *p);
-	print_receiver_helps(d);
-	print_filter_helps(d);
-	print_writer_helps(d);
+	struct ggo_help h = DEFINE_GGO_HELP(audiod);
+	bool d = conf.detailed_help_given;
+	unsigned flags;
+
+	flags = d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS;
+	ggo_print_help(&h, flags);
+
+	flags = d? GPH_MODULE_FLAGS_DETAILED : GPH_MODULE_FLAGS;
+	print_receiver_helps(flags);
+	print_filter_helps(flags);
+	print_writer_helps(flags);
 	exit(0);
 }
 
@@ -1351,8 +1351,8 @@ int main(int argc, char *argv[])
 
 	valid_fd_012();
 	audiod_cmdline_parser_ext(argc, argv, &conf, &params);
-	HANDLE_VERSION_FLAG("audiod", conf);
 	daemon_set_loglevel(conf.loglevel_arg);
+	version_handle_flag("audiod", conf.version_given);
 	/* init receivers/filters/writers early to make help work */
 	recv_init();
 	filter_init();