Changeset 5706:db47b2d9c689 in roaraudio

Timestamp:

10/24/12 13:15:26 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make it more easy to access DMX channels via plugin

Files:

• ChangeLog (modified) (1 diff)
• roard/include/light.h (modified) (1 diff)
• roard/include/plugins.h (modified) (1 diff)
• roard/light.c (modified) (3 diffs)

ChangeLog

@@ -1 +1 @@
 v. 1.0beta8 - ?
+        * Changed plugin ABI version number for roard.
 
 v. 1.0beta7 - Tue Oct 23 2012 23:28 CEST

roard/include/light.h

@@ -53 +53 @@
 int light_send_stream   (int id);
 
+// for plugins:
+int light_dmxchannel_get(size_t index);
+int light_dmxchannel_set(size_t index, unsigned char val);
+
 #endif
 

roard/include/plugins.h

@@ -30 +30 @@
 
 #define ROARD_DL_APPNAME    "roard " ROAR_VSTR_ROARAUDIO
-#define ROARD_DL_ABIVERSION "1.0beta7"
+#define ROARD_DL_ABIVERSION "1.0beta8"
 
 int plugins_preinit  (void);

roard/light.c

@@ -32 +32 @@
 struct light_mixer g_light_mixer;
 // //
+
+static inline void __set_channel(size_t index, unsigned char val) {
+ g_light_state.changes[index] |= g_light_state.state[index] ^ val;
+ g_light_state.state[index]    =                              val;
+}
 
 int light_init  (uint32_t channels) {
@@ -140 +145 @@
 
     for (i = 0; i < (g_light_state.channels < 512 ? g_light_state.channels : 512); i++) {
-     g_light_state.changes[i] |= g_light_state.state[i] ^ buf[i];
-     g_light_state.state[i]    =                          buf[i];
+     __set_channel(i, buf[i]);
     }
 //    memcpy(g_light_state.state, buf, g_light_state.channels < 512 ? g_light_state.channels : 512);
@@ -257 +261 @@
 }
 
+int light_dmxchannel_get(size_t index) {
+ if ( (size_t)g_light_state.channels <= index ) {
+  roar_err_set(ROAR_ERROR_NOENT);
+  return -1;
+ }
+
+ return (int)(unsigned int)(unsigned char)g_light_state.state[index];
+}
+
+int light_dmxchannel_set(size_t index, unsigned char val) {
+ if ( (size_t)g_light_state.channels <= index ) {
+  roar_err_set(ROAR_ERROR_NOENT);
+  return -1;
+ }
+
+ __set_channel(index, val);
+ return 0;
+}
+
 #endif