X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ortp_send.c;h=46b3ece763aaed16f8de964a40d5c5c91d10eaf2;hp=07e3cccfbc65423bcd0455d1b9eb5617fbbe1c91;hb=97ac310e824b671c530d4c982e30a74a86dc581a;hpb=89cde2c587229f04d779e3a387c4a801261d87f0

diff --git a/ortp_send.c b/ortp_send.c
index 07e3cccf..46b3ece7 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);
@@ -118,23 +116,25 @@ static void ortp_init_session(struct ortp_target *ot)
 /* called by afs */
 static void ortp_shutdown_targets(void)
 {
-	char buf[2];
+	char buf[ORTP_AUDIO_HEADER_LEN];
 	struct ortp_target *ot, *tmp;
 
-	buf[0] = ORTP_EOF;
+	WRITE_PACKET_TYPE(buf, ORTP_EOF);
 	list_for_each_entry_safe(ot, tmp, &targets, node) {
 		if (!ot->session || !ot->streaming)
 			continue;
-		PARA_INFO_LOG("sending eof to ortp target %s:%d, ts = %d\n", TARGET_ADDR(ot), ot->port,
-			ot->last_ts);
-		rtp_session_send_with_ts(ot->session, buf, 1, ot->last_ts);
+		PARA_INFO_LOG("sending eof to ortp target %s:%d, ts = %d\n",
+			TARGET_ADDR(ot), ot->port, ot->last_ts);
+		rtp_session_send_with_ts(ot->session, buf,
+			ORTP_AUDIO_HEADER_LEN, ot->last_ts);
 		ot->streaming = 0;
 		ot->chunk_ts = 0;
 		rtp_session_reset(ot->session);
 	}
 }
 
-static int need_extra_header(struct audio_format *af, long unsigned chunks_sent)
+static int need_extra_header(struct audio_format_handler *af,
+		long unsigned chunks_sent)
 {
 	/* FIXME: No need to compute this on every run */
 	int mod = conf.ortp_header_interval_arg / (tv2ms(&af->chunk_tv) + 1);
@@ -143,7 +143,7 @@ static int need_extra_header(struct audio_format *af, long unsigned chunks_sent)
 	return 1;
 }
 
-static void ortp_send(struct audio_format *af, long unsigned current_chunk,
+static void ortp_send(struct audio_format_handler *af, long unsigned current_chunk,
 		long unsigned chunks_sent, const char *buf, size_t len)
 {
 	struct ortp_target *ot, *tmp;
@@ -290,7 +290,7 @@ success:
 	}
 }
 
-static void ortp_pre_select(__a_unused struct audio_format *af,
+static void ortp_pre_select(__a_unused struct audio_format_handler *af,
 	__a_unused  int *max_fileno, __a_unused fd_set *rfds,
 	__a_unused fd_set *wfds)
 {