diff options
| -rw-r--r-- | backends/artnet.c | 2 | ||||
| -rw-r--r-- | backends/openpixelcontrol.c | 1 | ||||
| -rw-r--r-- | backends/sacn.c | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/backends/artnet.c b/backends/artnet.c index f1b8c0e..9fac332 100644 --- a/backends/artnet.c +++ b/backends/artnet.c @@ -356,7 +356,7 @@ static int artnet_handle(size_t num, managed_fd* fds){ for(u = 0; u < artnet_fds; u++){ for(c = 0; c < artnet_fd[u].output_instances; c++){ synthesize_delta = timestamp - artnet_fd[u].output_instance[c].last_frame; - if((artnet_fd[u].output_instance[c].mark + if((artnet_fd[u].output_instance[c].mark && synthesize_delta >= ARTNET_FRAME_TIMEOUT + ARTNET_SYNTHESIZE_MARGIN) //synthesize next frame || synthesize_delta >= ARTNET_KEEPALIVE_INTERVAL){ //keepalive timeout inst = mm_instance_find(BACKEND_NAME, artnet_fd[u].output_instance[c].label); diff --git a/backends/openpixelcontrol.c b/backends/openpixelcontrol.c index ca395d3..d9d7d4b 100644 --- a/backends/openpixelcontrol.c +++ b/backends/openpixelcontrol.c @@ -1,5 +1,4 @@ #define BACKEND_NAME "openpixelcontrol" -#define DEBUG #include <string.h> diff --git a/backends/sacn.c b/backends/sacn.c index 54cc7b5..79ffb46 100644 --- a/backends/sacn.c +++ b/backends/sacn.c @@ -223,7 +223,7 @@ static channel* sacn_channel(instance* inst, char* spec, uint8_t flags){ char* spec_next = spec; unsigned chan_a = strtoul(spec, &spec_next, 10), chan_b = 0; - + //range check if(!chan_a || chan_a > 512){ LOGPF("Channel out of range on instance %s: %s", inst->name, spec); @@ -540,7 +540,7 @@ static int sacn_handle(size_t num, managed_fd* fds){ } //update next frame request - if(global_cfg.fd[u].universe[c].mark + if(global_cfg.fd[u].universe[c].mark && (!global_cfg.next_frame || global_cfg.next_frame > SACN_FRAME_TIMEOUT + SACN_SYNTHESIZE_MARGIN - synthesize_delta)){ global_cfg.next_frame = SACN_FRAME_TIMEOUT + SACN_SYNTHESIZE_MARGIN - synthesize_delta; } |