Changeset 2489:266b1a6c9683 in roaraudio

Timestamp:

08/24/09 00:34:37 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support to disable ssynth

Location:

roard

Files:

• include/ssynth.h (modified) (2 diffs)
• loop.c (modified) (1 diff)
• midi.c (modified) (3 diffs)
• roard.c (modified) (5 diffs)
• ssynth.c (modified) (2 diffs)

roard/include/ssynth.h

@@ -27 +27 @@
 
 #include <roaraudio.h>
+
+#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
 
 #define SSYNTH_NOTES_MAX            16
@@ -82 +84 @@
 #endif
 
+#endif
+
 //ll

roard/loop.c

@@ -112 +112 @@
 
   midi_reinit();
+#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
   ssynth_update();
+#endif
   light_reinit();
 

roard/midi.c

@@ -84 +84 @@
   midi_check_bridge(g_midi_clock.stream);
 
+#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
  midi_conv_mes2ssynth();
+#endif
 
 #ifndef ROAR_WITHOUT_DCOMP_CB
@@ -426 +428 @@
 #undef _nb
 
+#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
 int midi_conv_mes2ssynth(void) {
  struct roar_buffer        * buf = g_midi_mess.buf;
@@ -444 +447 @@
  return 0;
 }
+#endif
 
 int midi_new_bufmes    (struct roar_buffer ** buf, struct midi_message ** mes) {

roard/roard.c

@@ -105 +105 @@
         " --midi-console-enable - Enables the console based MIDI synth\n"
         " --midi-console DEV    - Set device for MIDI console\n"
+#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
         " --ssynth-enable       - Enable simple software synth\n"
         " --ssynth-disable      - Disable simple software synth\n"
+#endif
        );
 
@@ -704 +706 @@
  }
 
+#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
  if ( ssynth_init_config() == -1 ) {
   ROAR_ERR("Can not init ssynth config!");
   return 1;
  }
+#endif
 
 #ifdef ROAR_SUPPORT_LISTEN
@@ -951 +955 @@
 
   } else if ( strcmp(k, "--ssynth-enable") == 0 ) {
+#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
    ssynth_conf.enable = 1;
+#else
+   ROAR_ERR("main(*): No support for ssynth compiled in");
+#endif
   } else if ( strcmp(k, "--ssynth-disable") == 0 ) {
+#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
    ssynth_conf.enable = 0;
+#else
+   // we can safely ignore the disable
+#endif
 
   } else if ( strcmp(k, "-p") == 0 || strcmp(k, "--port") == 0 ) {
@@ -1089 +1101 @@
  }
 
+#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
  if ( ssynth_init() == -1 ) {
   ROAR_ERR("Can not initialize ssynth subsystem");
  }
+#endif
 
  if ( light_init(light_channels) == -1 ) {
@@ -1348 +1362 @@
  streams_free();
  clients_free();
+#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
  ssynth_free();
+#endif
 #ifndef ROAR_WITHOUT_DCOMP_CB
  midi_cb_stop(); // stop console beep

roard/ssynth.c

@@ -24 +24 @@
 
 #include "roard.h"
+
+#ifndef ROAR_WITHOUT_DCOMP_SSYNTH
 
 float ssynth_polys[SSYNTH_POLY_POLYMAX][SSYNTH_POLY_COEFF] = {
@@ -303 +305 @@
 }
 
+#endif
+
 //ll