filter_chain.c: Cosmetics.

[paraslash.git] / ortp_send.c

diff --git a/ortp_send.c b/ortp_send.c
index 71544f4974e36f9be35f170d61bb10271cfdbd9e..17f14d17618e6b4893a176838b16ec9c8880437d 100644 (file)
--- 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. */
@@ -46,6 +46,7 @@ struct ortp_target {
 
 static struct list_head targets;
 static struct sender *self;
+static int sender_status;
 
 static void ortp_delete_target(struct ortp_target *ot, const char *msg)
 {
@@ -158,16 +159,16 @@ 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 (self->status != SENDER_ON)
+       if (sender_status != SENDER_ON)
                return;
 
 //     PARA_NOTICE_LOG("sending %lu\n", current_chunk);
@@ -189,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;
@@ -213,14 +213,14 @@ static void ortp_send(long unsigned current_chunk, long unsigned chunks_sent,
 static int ortp_com_on(__a_unused struct sender_command_data *scd)
 {
 
-       self->status = SENDER_ON;
+       sender_status = SENDER_ON;
        return 1;
 }
 
 static int ortp_com_off(__a_unused struct sender_command_data *scd)
 {
        ortp_shutdown_targets();
-       self->status = SENDER_OFF;
+       sender_status = SENDER_OFF;
        return 1;
 }
 
@@ -267,10 +267,11 @@ static char *ortp_info(void)
                tgts = tmp;
        }
        ret = make_message(
-               "ortp status: %s\n"
-               "ortp default port: udp %d\n"
-               "ortp targets: %s\n",
-               (self->status == SENDER_ON)? "on" : "off",
+               "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)"
        );
@@ -341,9 +342,9 @@ void ortp_send_init(struct sender *s)
        s->client_cmds[SENDER_ADD] = ortp_com_add;
        s->client_cmds[SENDER_DELETE] = ortp_com_delete;
        self = s;
-       s->status = SENDER_OFF;
+       sender_status = SENDER_OFF;
        ortp_init_target_list();
        if (!conf.ortp_no_autostart_given)
-               s->status = SENDER_ON;
-       PARA_DEBUG_LOG("%s", "ortp sender init complete\n");
+               sender_status = SENDER_ON;
+       PARA_DEBUG_LOG("ortp sender init complete\n");
 }