X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ortp_send.c;h=da590dcdcaf251800feca76546e873bd1fddd999;hp=19b54d3932897be20067c6b06b608653fafbf911;hb=9230155e692c3a2303a267759183dd1ad264dda1;hpb=a2ce091cb5387eb389638dd4aa8487ef2dda310e

diff --git a/ortp_send.c b/ortp_send.c
index 19b54d39..da590dcd 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,16 +116,16 @@ 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);
+		rtp_session_send_with_ts(ot->session, buf, ORTP_AUDIO_HEADER_LEN, ot->last_ts + ot->chunk_ts);
 		ot->streaming = 0;
 		ot->chunk_ts = 0;
 		rtp_session_reset(ot->session);
@@ -192,14 +190,14 @@ static void ortp_send(struct audio_format *af, long unsigned current_chunk,
 	free(sendbuf);
 }
 
-static int ortp_com_on(struct sender_command_data *scd)
+static int ortp_com_on(__a_unused struct sender_command_data *scd)
 {
 
 	self->status = SENDER_ON;
 	return 1;
 }
 
-static int ortp_com_off(struct sender_command_data *scd)
+static int ortp_com_off(__a_unused struct sender_command_data *scd)
 {
 	ortp_shutdown_targets();
 	self->status = SENDER_OFF;
@@ -290,8 +288,9 @@ success:
 	}
 }
 
-static void ortp_pre_select(struct audio_format *af, int *max_fileno,
-		fd_set *rfds, fd_set *wfds)
+static void ortp_pre_select(__a_unused struct audio_format *af,
+	__a_unused  int *max_fileno, __a_unused fd_set *rfds,
+	__a_unused fd_set *wfds)
 {
 	return;
 }