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

diff --git a/audiod.c b/audiod.c
index 0ff92e6f..64925b76 100644
--- a/audiod.c
+++ b/audiod.c
@@ -343,10 +343,11 @@ static void parse_config_or_die(void)
 		PARA_EMERG_LOG("can not read config file %s\n", config_file);
 		goto err;
 	}
-	if (ret)
+	if (ret) {
 		audiod_cmdline_parser_config_file(config_file, &conf, &params);
+		daemon_set_loglevel(conf.loglevel_arg);
+	}
 	free(config_file);
-	daemon_set_loglevel(conf.loglevel_arg);
 	return;
 err:
 	free(config_file);
@@ -427,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;
 
@@ -495,7 +496,7 @@ static void open_filters(struct slot_info *s)
 		fn->filter_num = a->filter_nums[i];
 		fn->conf = a->filter_conf[i];
 		fn->task.pre_select = f->pre_select;
-		fn->task.new_post_select = f->new_post_select;
+		fn->task.post_select = f->post_select;
 		fn->btrn = btr_new_node(&(struct btr_node_description)
 			EMBRACE(.name = f->name, .parent = parent,
 				.handler = f->execute, .context = fn));
@@ -559,7 +560,7 @@ static int open_receiver(int format)
 	PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
 		audio_formats[format], r->name, slot_num);
 	rn->task.pre_select = r->pre_select;
-	rn->task.new_post_select = r->new_post_select;
+	rn->task.post_select = r->post_select;
 	sprintf(rn->task.status, "%s receiver node", r->name);
 	register_task(&sched, &rn->task);
 	return slot_num;
@@ -1009,7 +1010,7 @@ static int signal_post_select(struct sched *s, __a_unused struct task *t)
 static void signal_setup_default(struct signal_task *st)
 {
 	st->task.pre_select = signal_pre_select;
-	st->task.new_post_select = signal_post_select;
+	st->task.post_select = signal_post_select;
 	sprintf(st->task.status, "signal task");
 }
 
@@ -1042,7 +1043,7 @@ static int command_post_select(struct sched *s, struct task *t)
 static void init_command_task(struct command_task *ct)
 {
 	ct->task.pre_select = command_pre_select;
-	ct->task.new_post_select = command_post_select;
+	ct->task.post_select = command_post_select;
 	ct->task.error = 0;
 	ct->fd = audiod_get_socket(); /* doesn't return on errors */
 	sprintf(ct->task.status, "command task");
@@ -1215,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) {
@@ -1272,7 +1273,7 @@ static void init_status_task(struct status_task *st)
 {
 	memset(st, 0, sizeof(struct status_task));
 	st->task.pre_select = status_pre_select;
-	st->task.new_post_select = status_post_select;
+	st->task.post_select = status_post_select;
 	st->sa_time_diff_sign = 1;
 	st->clock_diff_count = conf.clock_diff_count_arg;
 	st->current_audio_format_num = -1;
@@ -1300,18 +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", AUDIOD_CMDLINE_PARSER_PACKAGE "-"
-		AUDIOD_CMDLINE_PARSER_VERSION);
-	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);
 }
 
@@ -1350,9 +1350,9 @@ int main(int argc, char *argv[])
 	};
 
 	valid_fd_012();
-	if (audiod_cmdline_parser_ext(argc, argv, &conf, &params))
-		exit(EXIT_FAILURE);
-	HANDLE_VERSION_FLAG("audiod", conf);
+	audiod_cmdline_parser_ext(argc, argv, &conf, &params);
+	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();