Changeset 5977:6b7d6fcf80b5 in roaraudio for roard/codecfilter_roardmx.c

Timestamp:

01/27/14 18:57:46 (10 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added support for rangeset to roard and roarlight.

File:

• roard/codecfilter_roardmx.c (modified) (2 diffs)

roard/codecfilter_roardmx.c

@@ -53 +53 @@
 }
 
+static inline int __read_rangeset(int id, struct roar_stream_server * ss, struct roar_roardmx_message * mes) {
+ uint16_t start, end;
+ uint8_t value;
+ size_t p;
+ int i, c;
+
+ // we ignore errors here at the moment as 0 not < -1
+ c = roar_roardmx_message_numchannels(mes);
+ ROAR_DBG("__read_rangeset(id=%i, ...): Number of subframes: %u", id, c);
+
+ for (i = 0; i < c; i++) {
+  ROAR_DBG("__read_rangeset(id=%i, ...): i=%i", id, i);
+
+  if ( roar_roardmx_message_get_rangeval(mes, &start, &end, &value, i) == -1 ) {
+   ROAR_WARN("__read_rangeset(id=%i, ...): Can not read subframe: %i: %s", id, i, roar_errorstring);
+   return -1;
+  }
+
+  ROAR_DBG("__read_rangeset(id=%i, ...): i=%i, start=%u, end=%u, value=%u", id, i, start, end, value);
+
+  if ( start > end ) {
+   ROAR_WARN("__read_rangeset(id=%i, ...): Bad RoarDMX Rangeset frame: start > end.", id);
+   continue;
+  }
+
+  if ( g_light_state.channels < end ) {
+   ROAR_WARN("__read_rangeset(id=%i, ...): Range out of DMX universe: %u-%u", id, start, end);
+   continue;
+  }
+
+  for (p = start; p <= end; p++) {
+   g_light_state.state[p]   = value;
+   g_light_state.changes[p] = 0xFF; // the channel changed 
+  }
+ }
+
+ return 0;
+}
+
 static inline int __read_events(int id, struct roar_stream_server * ss, struct roar_roardmx_message * mes) {
  const uint8_t * events;
@@ -77 +116 @@
  switch (type) {
   case ROAR_ROARDMX_TYPE_SSET: return __read_sset(id, ss, &mes); break;
+  case ROAR_ROARDMX_TYPE_RANGESET: return __read_rangeset(id, ss, &mes); break;
   case ROAR_ROARDMX_TYPE_EVENT: return __read_events(id, ss, &mes); break;
  }