X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=c7b17b6f23067e2c8550f45078a64f6a15478f6c;hp=5515e5274f6ae152367b39f1a257c5fe5712fa6a;hb=1404c0dbc7265e42ac81fc1664c724630c3454e4;hpb=1a6fca660c4c8af101be0d576e009f40275757c0

diff --git a/audiod.c b/audiod.c
index 5515e527..c7b17b6f 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file audiod.c the paraslash's audio daemon */
@@ -636,7 +624,7 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
 			s->timeout = min_delay;
 			continue;
 		}
-		PARA_INFO_LOG("inital delay: %lu ms left\n", tv2ms(&diff));
+		PARA_INFO_LOG("initial delay: %lu ms left\n", tv2ms(&diff));
 		if (tv_diff(&s->timeout, &diff, NULL) > 0) {
 			s->timeout = diff;
 		}
@@ -1144,7 +1132,14 @@ int main(int argc, char *argv[])
 	para_drop_privileges(conf.user_arg, conf.group_arg);
 	cf = configfile_exists();
 	if (cf) {
-		if (audiod_cmdline_parser_configfile(cf, &conf, 0, 0, 0)) {
+		struct audiod_cmdline_parser_params params = {
+			.override = 0,
+			.initialize = 0,
+			.check_required = 0,
+			.check_ambiguity = 0
+
+		};
+		if (audiod_cmdline_parser_config_file(cf, &conf, &params)) {
 			PARA_EMERG_LOG("%s", "parse error in config file\n");
 			exit(EXIT_FAILURE);
 		}