aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorcbdev <cb@cbcdn.com>2020-03-11 20:50:29 +0100
committercbdev <cb@cbcdn.com>2020-03-11 20:50:29 +0100
commit678cc465124ad81dcec47c44cc30827e5246bd3b (patch)
treec409f37f5d0c7784155a645abda74f1ab0ea0596
parent20803bd7d7578706ad55b56cf1a4d8865b5c1285 (diff)
downloadmidimonster-678cc465124ad81dcec47c44cc30827e5246bd3b.tar.gz
midimonster-678cc465124ad81dcec47c44cc30827e5246bd3b.tar.bz2
midimonster-678cc465124ad81dcec47c44cc30827e5246bd3b.zip
Simplify ArtNet & sACN
-rw-r--r--backends/artnet.c4
-rw-r--r--backends/artnet.md2
-rw-r--r--backends/sacn.c4
3 files changed, 4 insertions, 6 deletions
diff --git a/backends/artnet.c b/backends/artnet.c
index 5d26b31..7d5d9ee 100644
--- a/backends/artnet.c
+++ b/backends/artnet.c
@@ -316,12 +316,10 @@ static inline int artnet_process_frame(instance* inst, artnet_pkt* frame){
for(p = 0; p <= max_mark; p++){
if(data->data.map[p] & MAP_MARK){
data->data.map[p] &= ~MAP_MARK;
+ chan = data->data.channel + p;
if(data->data.map[p] & MAP_FINE){
chan = data->data.channel + MAPPED_CHANNEL(data->data.map[p]);
}
- else{
- chan = data->data.channel + p;
- }
if(!chan){
LOGPF("Active channel %" PRIsize_t " on %s not known to core", p, inst->name);
diff --git a/backends/artnet.md b/backends/artnet.md
index 7e1ecff..383203d 100644
--- a/backends/artnet.md
+++ b/backends/artnet.md
@@ -3,6 +3,8 @@
The ArtNet backend provides read-write access to the UDP-based ArtNet protocol for lighting
fixture control.
+Art-Netâ„¢ Designed by and Copyright Artistic Licence Holdings Ltd.
+
#### Global configuration
| Option | Example value | Default value | Description |
diff --git a/backends/sacn.c b/backends/sacn.c
index dd05dc7..c9be8ff 100644
--- a/backends/sacn.c
+++ b/backends/sacn.c
@@ -431,12 +431,10 @@ static int sacn_process_frame(instance* inst, sacn_frame_root* frame, sacn_frame
if(inst_data->data.map[u] & MAP_MARK){
//unmark and get channel
inst_data->data.map[u] &= ~MAP_MARK;
+ chan = inst_data->data.channel + u;
if(inst_data->data.map[u] & MAP_FINE){
chan = inst_data->data.channel + MAPPED_CHANNEL(inst_data->data.map[u]);
}
- else{
- chan = inst_data->data.channel + u;
- }
if(!chan){
LOGPF("Active channel %" PRIsize_t " on %s not known to core", u, inst->name);