Changeset 5920:749a4a6a1413 in roaraudio for roard

Timestamp:

09/11/13 11:25:17 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added very basic support to handle RoarDMX events

Location:

roard

Files:

• include/light.h (modified) (2 diffs)
• light.c (modified) (3 diffs)

roard/include/light.h

@@ -32 +32 @@
 
 #define LIGHT_CHANNELS_DEFAULT 512 /* one DMX Universe */
+#define MAX_EVENTS_PER_CYCLE   16  /* this*cfreq is event thruput (16*100Hz = 1.6kEvents/s) */
 
 extern struct light_state {
  unsigned int    channels;
+ uint8_t events[MAX_EVENTS_PER_CYCLE];
+ size_t eventsqueuelen;
  uint8_t * state;
  uint8_t * changes;
@@ -57 +60 @@
 int light_dmxchannel_set(size_t index, uint8_t val);
 
+int light_dmxevent_add(const uint8_t * events, size_t len);
+int light_dmxevent_read(const uint8_t ** events, size_t * len);
+#define light_dmxevent_addone(event) light_dmxevent_add(&(uint8_t){(event)}, 1)
+
 // codec filters:
 int cf_light_roardmx_read(int id, struct roar_stream_server * ss);

roard/light.c

@@ -104 +104 @@
  memset(g_light_state.state,   0, g_light_state.channels);
  memset(g_light_state.changes, 0, g_light_state.channels);
+ memset(g_light_state.events,  0, sizeof(g_light_state.events));
+
+ g_light_state.eventsqueuelen = 0;
 
  return 0;
@@ -113 +116 @@
 
  memset(g_light_state.changes, 0, g_light_state.channels);
+ memset(g_light_state.events,  0, sizeof(g_light_state.events));
+
+ g_light_state.eventsqueuelen = 0;
 
  return 0;
@@ -236 +242 @@
 }
 
+int light_dmxevent_add(const uint8_t * events, size_t len) {
+ size_t i;
+
+ if ( events == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ if ( len > (sizeof(g_light_state.events) - g_light_state.eventsqueuelen) ) {
+  roar_err_set(ROAR_ERROR_NOSPC);
+  return -1;
+ }
+
+ for (i = 0; i < len; i++) {
+  g_light_state.events[g_light_state.eventsqueuelen++] = events[i];
+  roar_notify_core_emit_simple(ROAR_DATA_DMX512_EVENT, -1, g_light_mixer.stream, ROAR_OT_STREAM, events[i], -1, NULL, -1);
+ }
+
+ return 0;
+}
+
+int light_dmxevent_read(const uint8_t ** events, size_t * len) {
+ if ( events == NULL || len == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ *events = g_light_state.events;
+ *len    = g_light_state.eventsqueuelen;
+
+ return 0;
+}
+
 #endif