X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=8f2a72ac8700ee0699c19d78724cbe1d6ec61296;hp=d2c66f2bfe5f5bd0d8ba1da88b048ad21d9ceb00;hb=6824b139a61f9cb01d00daf08beb12cedb8804d3;hpb=484e75562df55dca31ffcb9e5b05a490b4a3d3a1

diff --git a/audiod.c b/audiod.c
index d2c66f2b..8f2a72ac 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;
 
@@ -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();