X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=8eb425da95af4701879e0e077efc496a20bbdeb7;hb=ce2bb6c458275ec6c0a115a2c814a15761474f11;hp=e6e9041801e416828d76556929d4a2f7033a1de3;hpb=6693375b52f2712ace6dc50b717de9cb371a7c2a;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index e6e90418..8eb425da 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <noll@mathematik.tu-darmstadt.de>
+ * 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
@@ -1019,17 +1019,14 @@ static void status_pre_select(struct sched *s, struct task *t)
 		if (tv_diff(now, &st->clock_diff_barrier, NULL) < 0)
 			return;
 		PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
-		t->ret = client_parse_config(argc, argv, &st->pcd);
+		t->ret = client_open(argc, argv, &st->pcd);
 
 	} else {
 		char *argv[] = {"audiod", "stat", NULL};
 		int argc = 2;
-		t->ret = client_parse_config(argc, argv, &st->pcd);
+		t->ret = client_open(argc, argv, &st->pcd);
 	}
 
-	if (t->ret < 0)
-		return;
-	t->ret = client_open(st->pcd);
 	if (t->ret < 0)
 		return;
 	st->pcd->task.event_handler = client_task_event_handler;
@@ -1097,6 +1094,7 @@ int main(int argc, char *argv[])
 
 	valid_fd_012();
 	audiod_cmdline_parser(argc, argv, &conf);
+	HANDLE_VERSION_FLAG("audiod", conf);
 	para_drop_privileges(conf.user_arg, conf.group_arg);
 	cf = configfile_exists();
 	if (cf) {