Changeset 5982:c38f275b38ae in roaraudio for roard/roard.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/roard.c (modified) (4 diffs)

roard/roard.c

@@ -1301 +1301 @@
 
 
+#if defined(ROAR_HAVE_MAIN_ARGS) && !defined(ROAR_WITHOUT_DCOMP_LIGHT)
+struct light_filter {
+ const char * name;
+ char * para;
+};
+
+static int light_filter_add(int primary, struct light_filter * filter) {
+ struct roar_keyval * kv;
+ ssize_t kvlen;
+ int ret;
+ int err;
+
+ if ( filter->para == NULL ) {
+  kvlen = -1;
+  kv = NULL;
+ } else {
+  kvlen = roar_keyval_split(&kv, filter->para, NULL, NULL, 1);
+  if ( kvlen == -1 ) {
+   ROAR_ERR("light_filter_add(primar=%i, filter={name='%s', para=%p}): Can not split string: %s", primary, filter->name, filter->para, roar_errorstring);
+   return -1;
+  }
+ }
+
+ ret = light_filter_load(primary, filter->name, 1, kv, kvlen);
+ err = roar_error;
+ if ( kv != NULL )
+  roar_mm_free(kv);
+
+ if ( ret == -1 ) {
+  roar_err_set(err);
+  ROAR_ERR("light_filter_add(primary=%i, filter={name='%s', para=%p}): Can not load filter: %s", primary, filter->name, filter->para, roar_errorstring);
+  return -1;
+ }
+
+ return 0;
+}
+#endif
+
 // MAIN:
 
@@ -1399 +1437 @@
  struct roar_vio_calls pidfile_vio;
 #endif
+#if defined(ROAR_HAVE_MAIN_ARGS) && !defined(ROAR_WITHOUT_DCOMP_LIGHT)
+ struct light_filter light_filter[32] = {{"chain", NULL}};
+ int    light_filter_count = 1;
+ char * light_filter_para  = NULL;
+#endif
 
  ROAR_DBG("main(*): starting roard...");
@@ -1677 +1720 @@
   } else if ( strcmp(k, "--list-plugins") == 0 ) {
    metaaction = MA_LIST_PLUGIN;
+
+  } else if ( strcmp(k, "--light-filter-load") == 0 ) {
+   ROAR_CKHAVEARGS(1);
+   if ( light_filter_count == (sizeof(light_filter)/sizeof(*light_filter)) ) {
+    ROAR_ERR("Can not load any more light filters: %s", argv[++i]);
+   } else {
+    light_filter[light_filter_count].name = argv[++i];
+    light_filter[light_filter_count].para = light_filter_para;
+    light_filter_count++;
+   }
+   light_filter_para = NULL;
+  } else if ( strcmp(k, "--light-filter-load-primary") == 0 ) {
+   ROAR_CKHAVEARGS(1);
+   light_filter[0].name = argv[++i];
+   light_filter[0].para = light_filter_para;
+  } else if ( strcmp(k, "--light-filter-args") == 0 ) {
+   ROAR_CKHAVEARGS(1);
+   light_filter_para = argv[++i];
 
   } else if ( strcmp(k, "--guest-acclev") == 0 ) {
@@ -2335 +2396 @@
   ROAR_ERR("Can not initialize light control subsystem");
  }
+ light_filter_add(1, &(light_filter[0]));
+ for (i = 1; i < light_filter_count; i++)
+  light_filter_add(0, &(light_filter[i]));
 #endif