X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ortp_send.c;h=17f14d17618e6b4893a176838b16ec9c8880437d;hp=6a9d19c7b54121b1200bbe30a46a054a82ffe922;hb=d27b31524e1d60ad4fdbeb606bba31ba0ee54048;hpb=d4171bf0379c24a15df0281c5328c53087e446f4;ds=sidebyside

diff --git a/ortp_send.c b/ortp_send.c
index 6a9d19c7..17f14d17 100644
--- a/ortp_send.c
+++ b/ortp_send.c
@@ -17,8 +17,8 @@
 #include "afs.h"
 #include "server.h"
 #include "vss.h"
-#include "send.h"
 #include "list.h"
+#include "send.h"
 #include "ortp.h"
 
 /** Convert in_addr to ascii. */
@@ -159,13 +159,13 @@ static int need_extra_header(long unsigned current_chunk)
 }
 
 static void ortp_send(long unsigned current_chunk, long unsigned chunks_sent,
-		const char *buf, size_t len)
+		const char *buf, size_t len, const char *header_buf,
+		size_t header_len)
 {
 	struct ortp_target *ot, *tmp;
 	size_t sendbuf_len;
-	size_t header_len = 0;
 	int packet_type = ORTP_DATA;
-	char *sendbuf, *header_buf = NULL;
+	char *sendbuf;
 	struct timeval *chunk_tv;
 
 	if (sender_status != SENDER_ON)
@@ -190,7 +190,6 @@ static void ortp_send(long unsigned current_chunk, long unsigned chunks_sent,
 	}
 	if (list_empty(&targets))
 		return;
-	header_buf = vss_get_header(&header_len);
 	if (!need_extra_header(current_chunk))
 		header_len = 0;
 	sendbuf_len = ORTP_AUDIO_HEADER_LEN + header_len + len;
@@ -268,9 +267,10 @@ static char *ortp_info(void)
 		tgts = tmp;
 	}
 	ret = make_message(
-		"ortp status: %s\n"
-		"ortp default port: udp %d\n"
-		"ortp targets: %s\n",
+		"ortp sender:\n"
+		"\tstatus: %s\n"
+		"\tport: udp %d\n"
+		"\ttargets: %s\n",
 		(sender_status == SENDER_ON)? "on" : "off",
 		conf.ortp_default_port_arg,
 		tgts? tgts : "(none)"
@@ -346,5 +346,5 @@ void ortp_send_init(struct sender *s)
 	ortp_init_target_list();
 	if (!conf.ortp_no_autostart_given)
 		sender_status = SENDER_ON;
-	PARA_DEBUG_LOG("%s", "ortp sender init complete\n");
+	PARA_DEBUG_LOG("ortp sender init complete\n");
 }