Get rid of sender->status.

[paraslash.git] / ortp_send.c

diff --git a/ortp_send.c b/ortp_send.c
index 71544f4974e36f9be35f170d61bb10271cfdbd9e..6a9d19c7b54121b1200bbe30a46a054a82ffe922 100644 (file)
--- a/ortp_send.c
+++ b/ortp_send.c
@@ -46,6 +46,7 @@ struct ortp_target {
 
 static struct list_head targets;
 static struct sender *self;
 
 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)
 {
 
 static void ortp_delete_target(struct ortp_target *ot, const char *msg)
 {


@@ -167,7 +168,7 @@ static void ortp_send(long unsigned current_chunk, long unsigned chunks_sent,
        char *sendbuf, *header_buf = NULL;
        struct timeval *chunk_tv;
 
        char *sendbuf, *header_buf = NULL;
        struct timeval *chunk_tv;
 

-       if (self->status != SENDER_ON)
+       if (sender_status != SENDER_ON)

                return;
 
 //     PARA_NOTICE_LOG("sending %lu\n", current_chunk);
                return;
 
 //     PARA_NOTICE_LOG("sending %lu\n", current_chunk);


@@ -213,14 +214,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)
 {
 
 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();
        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;
 }
 
        return 1;
 }
 


@@ -270,7 +271,7 @@ static char *ortp_info(void)
                "ortp status: %s\n"
                "ortp default port: udp %d\n"
                "ortp targets: %s\n",
                "ortp status: %s\n"
                "ortp default port: udp %d\n"
                "ortp targets: %s\n",

-               (self->status == SENDER_ON)? "on" : "off",
+               (sender_status == SENDER_ON)? "on" : "off",

                conf.ortp_default_port_arg,
                tgts? tgts : "(none)"
        );
                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->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)
        ortp_init_target_list();
        if (!conf.ortp_no_autostart_given)

-               s->status = SENDER_ON;
+               sender_status = SENDER_ON;

        PARA_DEBUG_LOG("%s", "ortp sender init complete\n");
 }
        PARA_DEBUG_LOG("%s", "ortp sender init complete\n");
 }