Changeset 6018:e0df5c74ff43 in roaraudio

Timestamp:

06/22/14 07:59:39 (10 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Changed ABI version of roard and light_dmxchannel_*()

Files:

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

ChangeLog

@@ -5 +5 @@
         * Removed roard plugins dmx-random and dmx-strobe from autobuild list
           as they are replaced by SLFI filters 'random' and 'strobe'.
+        * Changed ABI version of roard because of updates on light_dmxchannel_*().
 
 v. 1.0beta11 - Tue Jan 21 2014 21:04 CET

roard/include/light.h

@@ -62 +62 @@
 
 // for plugins:
-int     light_dmxchannel_get(size_t index);
-int     light_dmxchannel_set(size_t index, uint8_t val);
-ssize_t light_dmxchannel_num(void);
-int     light_dmxchannel_swap_universe(uint8_t * universe, size_t len);
+// Those functions should be avoided. Please write SLFI filters instead!
+int     light_dmxchannel_get(size_t index); // get channel value from output state.
+int     light_dmxchannel_set(size_t index, uint8_t val); // set channel in input state.
+ssize_t light_dmxchannel_num(void); // returns number of channels.
 
 int light_dmxevent_add(const uint8_t * events, size_t len);

roard/include/plugins.h

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

roard/light.c

@@ -327 +327 @@
  }
 
- return (int)(unsigned int)(uint8_t)g_light_state.state[index];
+ return (int)(unsigned int)(uint8_t)g_light_state.output[index];
 }
 
@@ -349 +349 @@
 }
 
-int     light_dmxchannel_swap_universe(uint8_t * universe, size_t len) {
- uint8_t c;
- size_t i;
-
- if ( g_light_state.state == NULL ) {
-  roar_err_set(ROAR_ERROR_BADSTATE);
-  return -1;
- }
-
- if ( g_light_state.channels != len ) {
-  roar_err_set(ROAR_ERROR_FAULT);
-  return -1;
- }
-
- for (i = 0; i < len; i++) {
-  c = g_light_state.state[i];
-  __set_channel(i, universe[i]);
-  universe[i] = c;
- }
-
- return 0;
-}
-
 int light_dmxevent_add(const uint8_t * events, size_t len) {
  size_t i;