Changeset 2494:353c82155185 in roaraudio

Timestamp:

08/24/09 02:20:24 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support to disable light subsystem and some parts of MIDI and raw

File:

• roard/roard.c (modified) (7 diffs)

roard/roard.c

@@ -111 +111 @@
        );
 
+#ifndef ROAR_WITHOUT_DCOMP_LIGHT
  printf("\nLight Control Options:\n\n");
  printf(" --light-channels NUM  - Sets the number of channels for Light control (default: %i)\n",
                                   LIGHT_CHANNELS_DEFAULT
        );
+#endif
 
  printf("\nServer Options:\n\n");
@@ -372 +374 @@
    if ( !strcasecmp(v, "wave") || !strcasecmp(v, "waveform") ) {
     dir = ROAR_DIR_OUTPUT;
+#ifndef ROAR_WITHOUT_DCOMP_MIDI
    } else if ( !strcasecmp(v, "midi") ) {
     dir = ROAR_DIR_MIDI_OUT;
+#endif
+#ifndef ROAR_WITHOUT_DCOMP_LIGHT
    } else if ( !strcasecmp(v, "light") ) {
     dir = ROAR_DIR_LIGHT_OUT;
+#endif
+#ifndef ROAR_WITHOUT_DCOMP_RAW
    } else if ( !strcasecmp(v, "raw") ) {
     dir = ROAR_DIR_RAW_OUT;
+#endif
    } else {
-    ROAR_ERR("add_output(*): unknown subsystem '%s'", k);
+    ROAR_ERR("add_output(*): unknown/unsupported subsystem '%s'", k);
     error++;
    }
@@ -548 +556 @@
 
   snprintf(attr, sizeof(attr), "(wave-rate=%i),(wave-channels=%i),(wave-bits=%i),"
-                               "(light-channels=%i),(location=%s)",
+#ifndef ROAR_WITHOUT_DCOMP_LIGHT
+                               "(light-channels=%i),"
+#endif
+                               "(location=%s)",
            g_sa->rate, g_sa->channels, g_sa->bits,
+#ifndef ROAR_WITHOUT_DCOMP_LIGHT
            g_light_state.channels,
+#endif
            location
           );
@@ -638 +651 @@
  int    o_prim    = 0;
  int    o_count   = 0;
+#ifndef ROAR_WITHOUT_DCOMP_LIGHT
  int    light_channels = LIGHT_CHANNELS_DEFAULT;
+#endif
  char * sock_grp  = ROAR_DEFAULT_SOCKGRP;
  char * sock_user = NULL;
@@ -932 +947 @@
 
   } else if ( strcmp(k, "--light-channels") == 0 ) {
+#ifndef ROAR_WITHOUT_DCOMP_LIGHT
    light_channels = atoi(argv[++i]);
+#else
+   ROAR_WARN("main(*): no light subsystem compiled in");
+#endif
 
   } else if ( strcmp(k, "--midi-no-console") == 0 ) {
@@ -1107 +1126 @@
 #endif
 
+#ifndef ROAR_WITHOUT_DCOMP_LIGHT
  if ( light_init(light_channels) == -1 ) {
   ROAR_ERR("Can not initialize light control subsystem");
  }
+#endif
 
 #ifdef ROAR_SUPPORT_LISTEN
@@ -1369 +1390 @@
 #endif
  midi_free();
+#ifndef ROAR_WITHOUT_DCOMP_LIGHT
  light_free();
+#endif
 
 #ifdef SUPPORT_PIDFILE