X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=d815c4aa6c98e699dc48304cd96db1d14c28035b;hp=9ed319f4c27ab7e202082552f1a0ffa9328fe60f;hb=42ddd68159d7eff0f3e7c225665c97f9abd59425;hpb=d80f5d3ac72591069728fd786d9a0fd96ccfd06f

diff --git a/audiod.c b/audiod.c
index 9ed319f4..d815c4aa 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1,12 +1,18 @@
 /*
- * 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.
  */
 
 /** \file audiod.c The paraslash's audio daemon. */
+
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 #include <signal.h>
 
 #include "para.h"
@@ -213,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.
@@ -641,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;
@@ -649,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);
@@ -680,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)
@@ -1031,22 +1034,35 @@ static int command_post_select(struct sched *s, struct task *t)
 	int ret;
 	struct command_task *ct = container_of(t, struct command_task, task);
 	static struct timeval last_status_dump;
-	struct timeval tmp, delay = {5, 0};
-	bool force = false;
-
-	tv_add(&last_status_dump, &delay, &tmp);
-	if (tv_diff(&tmp, now, NULL) < 0) {
-		last_status_dump = *now;
-		force = true;
-	}
+	struct timeval tmp, delay;
+	bool force = true;
 
 	ret = handle_connect(ct->fd, &s->rfds);
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	else if (ret > 0)
-		force = true;
+		goto dump;
+
+	/* if last status dump was less than 500ms ago, do nothing */
+	delay.tv_sec = 0;
+	delay.tv_usec = 500 * 1000;
+	tv_add(&last_status_dump, &delay, &tmp);
+	if (tv_diff(now, &tmp, NULL) < 0)
+		return 0;
+
+	/*
+	 * If last status dump was more than 5s ago, force update. Otherwise,
+	 * update only those items that have changed.
+	 */
+	delay.tv_sec = 5;
+	delay.tv_usec = 0;
+	tv_add(&last_status_dump, &delay, &tmp);
+	if (tv_diff(now, &tmp, NULL) < 0)
+		force = false;
+dump:
 	audiod_status_dump(force);
-	return 0;
+	last_status_dump = *now;
+	return 1;
 }
 
 static void init_command_task(struct command_task *ct)