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

diff --git a/audiod.c b/audiod.c
index 0ff92e6f..e3e3bd9a 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);
@@ -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");
@@ -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;
@@ -1350,9 +1351,9 @@ int main(int argc, char *argv[])
 	};
 
 	valid_fd_012();
-	if (audiod_cmdline_parser_ext(argc, argv, &conf, &params))
-		exit(EXIT_FAILURE);
+	audiod_cmdline_parser_ext(argc, argv, &conf, &params);
 	HANDLE_VERSION_FLAG("audiod", conf);
+	daemon_set_loglevel(conf.loglevel_arg);
 	/* init receivers/filters/writers early to make help work */
 	recv_init();
 	filter_init();