X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=35c835ecc143fa6c2d73a1c16687f0ed8a8b8f00;hp=9d0d0741cb86dd2e94c78eff1ed3503df5edbdd6;hb=843950e7a85730b796bb6238b6e91111f7209c25;hpb=101e1fd3252d838458a6ad4015f497818c54c897

diff --git a/audiod.c b/audiod.c
index 9d0d0741..35c835ec 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 */
@@ -467,14 +455,16 @@ static int open_current_receiver(struct sched *s)
 	return open_receiver(i) < 0? 0 : 1;
 }
 
-static void compute_time_diff(const struct timeval *status_time)
+static unsigned compute_time_diff(const struct timeval *status_time)
 {
 	struct timeval tmp, diff;
-	static int count;
+	static unsigned count;
 	int sign, sa_time_diff_sign = stat_task->sa_time_diff_sign;
 	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);
@@ -504,6 +494,7 @@ static void compute_time_diff(const struct timeval *status_time)
 	);
 out:
 	stat_task->sa_time_diff_sign = sa_time_diff_sign;
+	return count;
 }
 
 static void check_stat_line(char *line)
@@ -546,13 +537,15 @@ static void check_stat_line(char *line)
 			delay.tv_usec = (conf.stream_delay_arg % 1000) * 1000;
 			stat_task->server_stream_start.tv_sec = sec;
 			stat_task->server_stream_start.tv_usec = usec;
-			if (stat_task->sa_time_diff_sign < 0)
-				tv_add(&stat_task->server_stream_start,
-					&stat_task->sa_time_diff, &a_start);
-			else
-				tv_diff(&stat_task->server_stream_start,
-					&stat_task->sa_time_diff, &a_start);
-			tv_add(&a_start, &delay, &initial_delay_barrier);
+			if (compute_time_diff(NULL) > 2) {
+				if (stat_task->sa_time_diff_sign < 0)
+					tv_add(&stat_task->server_stream_start,
+						&stat_task->sa_time_diff, &a_start);
+				else
+					tv_diff(&stat_task->server_stream_start,
+						&stat_task->sa_time_diff, &a_start);
+				tv_add(&a_start, &delay, &initial_delay_barrier);
+			}
 		}
 		break;
 	case SI_CURRENT_TIME:
@@ -631,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;
 		}
@@ -1006,11 +999,16 @@ void __noreturn clean_exit(int status, const char *msg)
 	exit(status);
 }
 
+/* avoid busy loop if server is down */
+static void set_stat_task_restart_barrier(void)
+{
+	struct timeval delay = {5, 0};
+	tv_add(now, &delay, &stat_task->restart_barrier);
+}
 
 static void client_task_event_handler(__a_unused struct task *t)
 {
 	int i;
-	struct timeval delay = {1, 0};
 
 	if (t->ret == -E_HANDSHAKE_COMPLETE)
 		return;
@@ -1018,8 +1016,7 @@ static void client_task_event_handler(__a_unused struct task *t)
 	close_stat_pipe();
 	if (t->ret != -E_SERVER_EOF)
 		stat_task->clock_diff_count = conf.clock_diff_count_arg;
-	/* avoid busy loop if server is down */
-	tv_add(now, &delay, &stat_task->restart_barrier);
+	set_stat_task_restart_barrier();
 	FOR_EACH_AUDIO_FORMAT(i)
 		afi[i].restart_barrier = stat_task->restart_barrier;
 }
@@ -1048,6 +1045,7 @@ static void status_pre_select(struct sched *s, struct task *t)
 		int argc = 2;
 		ret = client_open(argc, argv, &st->pcd);
 	}
+	set_stat_task_restart_barrier();
 	if (ret < 0)
 		return;
 	st->pcd->task.event_handler = client_task_event_handler;