Changeset 2500:5e481907a8c0 in roaraudio

Timestamp:

08/24/09 02:55:13 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support to disable MIDI subsystem completly

Location:

roard

Files:

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

roard/include/midi.h

@@ -27 +27 @@
 
 #include <roaraudio.h>
+
+// CB has MIDI as dep
+#if defined(ROAR_WITHOUT_DCOMP_MIDI) && !defined(ROAR_WITHOUT_DCOMP_CB)
+#define ROAR_WITHOUT_DCOMP_CB
+#endif
+
+#ifndef ROAR_WITHOUT_DCOMP_MIDI
 
 #ifndef ROAR_WITHOUT_DCOMP_CB
@@ -166 +173 @@
 #endif
 
+#endif
+
 //ll

roard/lib.c

@@ -58 +58 @@
 // clients_free(); // delete all clients!, this allso delets all streams
 
+#ifndef ROAR_WITHOUT_DCOMP_MIDI
  midi_free(); // close midi devices
+#endif
 
  // close fh's we got ask to close:

roard/loop.c

@@ -74 +74 @@
   }
 
+#ifndef ROAR_WITHOUT_DCOMP_MIDI
   ROAR_DBG("main_loop(*): updating midi subsystem...");
   midi_update();
+#endif
 
   ROAR_DBG("main_loop(*): mixing clients...");
@@ -111 +113 @@
 #endif
 
+#ifndef ROAR_WITHOUT_DCOMP_MIDI
   midi_reinit();
+#endif
 #ifndef ROAR_WITHOUT_DCOMP_SSYNTH
   ssynth_update();

roard/midi.c

@@ -24 +24 @@
 
 #include "roard.h"
+
+#ifndef ROAR_WITHOUT_DCOMP_MIDI
 
 #if defined(ROAR_HAVE_IO_POSIX) && !defined(ROAR_TARGET_WIN32)
@@ -831 +833 @@
 }
 
+#endif
+
 //ll

roard/roard.c

@@ -101 +101 @@
        );
 
+#ifndef ROAR_WITHOUT_DCOMP_MIDI
  printf("\nMIDI Options:\n\n");
  printf(" --midi-no-console     - Disable console based MIDI synth\n"
@@ -110 +111 @@
 #endif
        );
+#endif
 
 #ifndef ROAR_WITHOUT_DCOMP_LIGHT
@@ -716 +718 @@
  }
 
+#ifndef ROAR_WITHOUT_DCOMP_MIDI
  if ( midi_init_config() == -1 ) {
   ROAR_ERR("Can not init MIDI config!");
   return 1;
  }
+#endif
 
 #ifndef ROAR_WITHOUT_DCOMP_SSYNTH
@@ -1116 +1120 @@
  ROAR_DBG("Server config: rate=%i, bits=%i, chans=%i", sa.rate, sa.bits, sa.channels);
 
+#ifndef ROAR_WITHOUT_DCOMP_MIDI
  if ( midi_init() == -1 ) {
   ROAR_ERR("Can not initialize MIDI subsystem");
  }
+#endif
 
 #ifndef ROAR_WITHOUT_DCOMP_SSYNTH
@@ -1389 +1395 @@
  midi_cb_stop(); // stop console beep
 #endif
+#ifndef ROAR_WITHOUT_DCOMP_MIDI
  midi_free();
+#endif
 #ifndef ROAR_WITHOUT_DCOMP_LIGHT
  light_free();