Merge commit 'meins/master'

[paraslash.git] / ortp_send.c

diff --git a/ortp_send.c b/ortp_send.c
index 96f4b4032a9feb3e9856519cb0ca382149141a5c..17f14d17618e6b4893a176838b16ec9c8880437d 100644 (file)
--- a/ortp_send.c
+++ b/ortp_send.c
@@ -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");
 }