X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=40f02f74907c1b1b60778acb4a742c018fb51014;hp=d9df3847b61c1ff93f7fcf8389ccb90baadff17e;hb=0c4bb93fbfc543cf2c5ff2acb6a7f7a824163b57;hpb=abfb661f35e99e99c09a94d84839356d905af080

diff --git a/audiod.c b/audiod.c
index d9df3847..40f02f74 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2014 Andre Noll <maan@tuebingen.mpg.de>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -310,17 +310,6 @@ empty:
 	return para_strdup(NULL);
 }
 
-static int want_colors(void)
-{
-	if (conf.color_arg == color_arg_no)
-		return 0;
-	if (conf.color_arg == color_arg_yes)
-		return 1;
-	if (conf.logfile_given)
-		return 0;
-	return isatty(STDERR_FILENO);
-}
-
 static void parse_config_or_die(void)
 {
 	int ret;
@@ -390,6 +379,7 @@ static void close_receiver(int slot_num)
 	task_reap(&s->receiver_node->task);
 	free(s->receiver_node);
 	s->receiver_node = NULL;
+	stat_task->current_audio_format_num = -1;
 	tv_add(now, &(struct timeval)EMBRACE(0, 200 * 1000),
 		&a->restart_barrier);
 }
@@ -968,7 +958,6 @@ static int parse_stream_args(void)
 /* does not unlink socket on errors */
 static int audiod_get_socket(void)
 {
-	struct sockaddr_un unix_addr;
 	int ret, fd;
 
 	if (conf.socket_given)
@@ -982,7 +971,7 @@ static int audiod_get_socket(void)
 	PARA_NOTICE_LOG("local socket: %s\n", socket_name);
 	if (conf.force_given)
 		unlink(socket_name);
-	ret = create_local_socket(socket_name, &unix_addr,
+	ret = create_local_socket(socket_name,
 		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
 	if (ret < 0)
 		goto err;
@@ -1358,18 +1347,6 @@ __noreturn static void print_help_and_die(void)
 	exit(0);
 }
 
-static void init_colors_or_die(void)
-{
-	int i;
-
-	if (!want_colors())
-		return;
-	daemon_set_default_log_colors();
-	daemon_set_flag(DF_COLOR_LOG);
-	for (i = 0; i < conf.log_color_given; i++)
-		daemon_set_log_color_or_die(conf.log_color_arg[i]);
-}
-
 /**
  * the main function of para_audiod
  *
@@ -1404,7 +1381,8 @@ int main(int argc, char *argv[])
 		print_help_and_die();
 	daemon_drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	parse_config_or_die();
-	init_colors_or_die();
+	daemon_init_colors_or_die(conf.color_arg, color_arg_auto, color_arg_no,
+		conf.logfile_given, conf.log_color_arg, conf.log_color_given);
 	init_random_seed_or_die();
 	daemon_set_flag(DF_LOG_TIME);
 	daemon_set_flag(DF_LOG_HOSTNAME);