From: Andre Noll <maan@systemlinux.org>
Date: Sun, 21 Mar 2010 10:40:10 +0000 (+0100)
Subject: audiod: Kill unused initial_delay_barrier.
X-Git-Tag: v0.4.2~20^2~4
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=25c11569;p=paraslash.git

audiod: Kill unused initial_delay_barrier.
---

diff --git a/audiod.c b/audiod.c
index 76a6af64..41fcdd8f 100644
--- a/audiod.c
+++ b/audiod.c
@@ -142,7 +142,6 @@ static struct status_task status_task_struct;
  * \sa struct status_task
  */
 static struct status_task *stat_task = &status_task_struct;
-static struct timeval initial_delay_barrier;
 
 /**
  * the task for handling audiod commands
@@ -713,20 +712,8 @@ static int update_item(int itemnum, char *buf)
 		break;
 	case SI_STREAM_START:
 		if (sscanf(buf, "%lu.%lu", &sec, &usec) == 2) {
-			struct timeval a_start, delay;
-			delay.tv_sec = conf.stream_delay_arg / 1000;
-			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 (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: