X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ortp_send.c;h=9dcde7fc376a0c526c4902641bf495b4650f55fc;hp=aabbb7da09abf953457dfb4915f593eb0f0a6612;hb=ff067f37f441537ffec6ef4ee86420ebae727f9a;hpb=15c54cf98b77882a8f4d59a550948133341ad671

diff --git a/ortp_send.c b/ortp_send.c
index aabbb7da..9dcde7fc 100644
--- a/ortp_send.c
+++ b/ortp_send.c
@@ -54,7 +54,6 @@ struct ortp_target {
 	RtpSession *session;
 };
 
-static int numtargets;
 static struct list_head targets;
 static struct sender *self;
 
@@ -66,7 +65,6 @@ static void ortp_delete_target(struct ortp_target *ot, const char *msg)
 		rtp_session_destroy(ot->session);
 		ot->session = NULL;
 	}
-	numtargets--;
 	list_del(&ot->node);
 	free(ot);
 }
@@ -77,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);
@@ -120,16 +116,17 @@ 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);
@@ -194,14 +191,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;
@@ -292,8 +289,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;
 }