From: Andre <maan@p133.(none)>
Date: Mon, 8 May 2006 22:29:33 +0000 (+0200)
Subject: Merge branch 'master' into aac
X-Git-Tag: v0.2.14~145
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=258534d8a29be72e529acdbf4daf54d6cd8bf5c7;hp=12b81c91b25b9d0d4bce43c4f87220c3c7f991da;p=paraslash.git

Merge branch 'master' into aac
---

diff --git a/ortp_send.c b/ortp_send.c
index 07e3cccf..9363d74e 100644
--- a/ortp_send.c
+++ b/ortp_send.c
@@ -75,9 +75,7 @@ static void ortp_send_buf(char *buf, int len, long unsigned chunks_sent)
 	int ret;
 
 	list_for_each_entry_safe(ot, tmp, &targets, node) {
-		struct timeval now;
 		int ts;
-		gettimeofday(&now, NULL);
 		if (!ot->session)
 			continue;
 		WRITE_CHUNK_TS(buf, ot->chunk_ts);
diff --git a/server.c b/server.c
index 6f70d977..caa32d8e 100644
--- a/server.c
+++ b/server.c
@@ -477,10 +477,8 @@ repeat:
 			&afl[mmd->audio_format] : NULL,
 			&rfds, &wfds);
 	}
-	if (!ret) {
-		afs_send_chunk();
-		status_refresh();
-	}
+	afs_send_chunk();
+	status_refresh();
 	if (FD_ISSET(signal_pipe, &rfds)) {
 		int sig;
 		sig = para_next_signal();