X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=bd32ad387fd7ee2d6c9816a4a7603354a572fa1f;hp=f12dbc1b999a0892abdcea5791692f1f5dfab3c3;hb=823a4ff87a03ff9e1d2bfe8bc501f55ee4213649;hpb=6a79f16de242c0c70ef56bbd96a748055df65917

diff --git a/audiod.c b/audiod.c
index f12dbc1b..bd32ad38 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -219,7 +219,7 @@ static int get_matching_audio_format_nums(const char *re)
  * from the status items received from para_server and the start time of the
  * (first) writer of the given slot.
  *
- * It has to to take into account that probably the stream was not started at
+ * It has to take into account that the stream was probably not started at
  * the beginning of the file, that the clock between the server and the client
  * host may differ and that playback of the stream was delayed, e.g. because
  * the prebuffer filter is used in the filter configuration of the given slot.
@@ -647,7 +647,7 @@ static bool must_start_decoder(void)
 	return true;
 }
 
-static unsigned compute_time_diff(const struct timeval *status_time)
+static void compute_time_diff(const struct timeval *status_time)
 {
 	struct timeval tmp, diff;
 	static unsigned count;
@@ -655,8 +655,6 @@ static unsigned compute_time_diff(const struct timeval *status_time)
 	const struct timeval max_deviation = {0, 500 * 1000};
 	const int time_smooth = 5;
 
-	if (!status_time)
-		return count;
 	sign = tv_diff(status_time, now, &diff);
 //		PARA_NOTICE_LOG("%s: sign = %i, sa_time_diff_sign = %i\n", __func__,
 //			sign, sa_time_diff_sign);
@@ -686,7 +684,6 @@ static unsigned compute_time_diff(const struct timeval *status_time)
 	);
 out:
 	stat_task->sa_time_diff_sign = sa_time_diff_sign;
-	return count;
 }
 
 static int update_item(int itemnum, char *buf)
@@ -1156,13 +1153,10 @@ static void close_unused_slots(void)
  */
 void __noreturn clean_exit(int status, const char *msg)
 {
-	int i;
-
 	if (socket_name)
 		unlink(socket_name);
 	close_stat_pipe();
-	FOR_EACH_SLOT(i)
-		close_slot(i);
+	close_unused_slots();
 	audiod_cmdline_parser_free(&conf);
 	close_stat_clients();
 	PARA_EMERG_LOG("%s\n", msg);
@@ -1398,7 +1392,7 @@ int main(int argc, char *argv[])
 	writer_init();
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
-	drop_privileges_or_die(conf.user_arg, conf.group_arg);
+	daemon_drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	parse_config_or_die();
 	init_colors_or_die();
 	init_random_seed_or_die();
@@ -1416,8 +1410,8 @@ int main(int argc, char *argv[])
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 		exit(EXIT_FAILURE);
 	}
-	log_welcome("para_audiod");
-	set_server_start_time(NULL);
+	daemon_log_welcome("para_audiod");
+	daemon_set_start_time();
 	set_initial_status();
 	FOR_EACH_SLOT(i)
 		clear_slot(i);