Changeset 5982:c38f275b38ae in roaraudio for roard/light.c

Timestamp:

02/23/14 15:46:19 (10 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added support to load light control filters into roard.

File:

• roard/light.c (modified) (4 diffs)

roard/light.c

@@ -70 +70 @@
 
  g_light_state.channels = channels;
+ g_light_state.filter   = NULL;
 
  if ( (g_light_mixer.stream = add_mixer(ROAR_SUBSYS_LIGHT, _MIXER_NAME("Light Control"), &ss)) == -1 ) {
@@ -92 +93 @@
 
 int light_free  (void) {
+ if ( g_light_state.filter != NULL ) {
+  roar_slfi_unref(g_light_state.filter);
+ }
+
  if ( g_light_state.state != NULL ) {
   roar_mm_free(g_light_state.state);
@@ -162 +167 @@
 
  // TODO: next run filters
+ if ( g_light_state.filter != NULL ) {
+  if ( roar_slfi_update(g_light_state.filter,
+                        g_light_state.output, g_light_state.channels,
+                        ((int32_t)1000000LU)/(int32_t)ROAR_OUTPUT_CFREQ,
+                        g_light_state.events, g_light_state.eventsqueuelen) == -1 ) {
+   ROAR_WARN("light_update(void): Can not run SLFI filter: %s", roar_errorstring);
+  }
+ }
 
  // calculate diffrence:
@@ -267 +280 @@
 }
 
+int light_filter_load(int primary, const char * name, int autoload, const struct roar_keyval * para, ssize_t paralen) {
+ struct roar_slfi_inst * filter;
+ int ret;
+ int err;
+
+ if ( primary && g_light_state.filter != NULL ) {
+  roar_err_set(ROAR_ERROR_ALREADY);
+  return -1;
+ } else if ( !primary && g_light_state.filter == NULL ) {
+  roar_err_set(ROAR_ERROR_BADSTATE);
+  return -1;
+ }
+
+ filter = roar_slfi_new(name, autoload, para, paralen);
+ if ( filter == NULL )
+  return -1;
+
+ if ( primary ) {
+  g_light_state.filter = filter;
+  return 0;
+ }
+
+ ret = roar_slfi_ctl(g_light_state.filter, ROAR_SLFI_CMD_PUSH, filter);
+ err = roar_error;
+
+ roar_slfi_unref(filter);
+
+ roar_err_set(err);
+ return ret;
+}
+
 int light_dmxchannel_get(size_t index) {
  if ( (size_t)g_light_state.channels <= index ) {