Changeset 1924:4b8f87ffd0b0 in roaraudio

Timestamp:

05/29/09 19:07:41 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make midi subsystem a bit configurable

Location:

roard

Files:

• include/midi.h (modified) (2 diffs)
• midi.c (modified) (5 diffs)
• roard.c (modified) (3 diffs)

roard/include/midi.h

@@ -69 +69 @@
 #define MIDI_MFLAG_FREE_DP     (1<<0)
 
+#define MIDI_INITED_MAIN        0x01
+#define MIDI_INITED_CB          0x02
+#define MIDI_INITED_CLOCK       0x04
+
+struct {
+ int init;
+ int inited;
+ int init_cb;
+ char * console_dev;
+} midi_config;
+
 struct midi_message {
  unsigned char   type;
@@ -103 +114 @@
 
 // general midi interface:
+int midi_init_config(void);
+
 int midi_init (void);
 int midi_free (void);

roard/midi.c

@@ -29 +29 @@
 #endif
 
+int midi_init_config(void) {
+ midi_config.init        = 1;
+ midi_config.inited      = 0;
+ midi_config.init_cb     = 1;
+ midi_config.console_dev = NULL;
+
+ return 0;
+}
+
 int midi_init (void) {
 
- if ( midi_cb_init() == -1 ) {
-  ROAR_WARN("Can not initialize MIDI subsystem component CB");
- }
-
- if ( midi_clock_init() == -1 ) {
-  ROAR_WARN("Can not initialize MIDI subsystem component clock");
+ midi_config.inited = 0;
+
+ if ( midi_config.init ) {
+  if ( midi_config.init_cb ) {
+   if ( midi_cb_init() == -1 ) {
+    ROAR_WARN("Can not initialize MIDI subsystem component CB");
+   }
+  }
+
+  if ( midi_clock_init() == -1 ) {
+   ROAR_WARN("Can not initialize MIDI subsystem component clock");
+  }
+
  }
 
  g_midi_mess.buf = NULL;
 
+ midi_config.inited |= MIDI_INITED_MAIN;
+
  return 0;
 }
 
 int midi_free (void) {
- return midi_cb_free();
+ if ( midi_reinit() == -1 )
+  return -1;
+
+ if ( midi_cb_free() == -1 )
+  return -1;
+
+ return 0;
 }
 
@@ -495 +519 @@
  midi_clock_set_bph(3600); // one tick per sec
 
+ midi_config.inited |= MIDI_INITED_CLOCK;
+
  return 0;
 }
@@ -560 +586 @@
  int i;
  char * files[] = {
+                   "/NX",
+                   "/dev/roarconsole",
                    "/dev/console",
 #ifdef __linux__
@@ -573 +601 @@
  g_midi_cb.playing  =  0;
 
+ if ( midi_config.console_dev != NULL ) {
+  files[0] = midi_config.console_dev;
+ }
+
  for (i = 0; files[i] != NULL; i++) {
   if ( (g_midi_cb.console = open(files[i], O_WRONLY|O_NOCTTY, 0)) != -1 )
@@ -615 +647 @@
  streams_set_flag(g_midi_cb.stream, ROAR_FLAG_HWMIXER);
  streams_set_flag(g_midi_cb.stream, ROAR_FLAG_MUTE);
+
+ midi_config.inited |= MIDI_INITED_CB;
 
  return 0;

roard/roard.c

@@ -79 +79 @@
 
  printf("\nMIDI Options:\n\n");
+ printf(" --midi-no-console     - Disable console based MIDI synth\n"
+        " --midi-console DEV    - Set device for MIDI console\n"
+       );
 
  printf("\nLight Control Options:\n\n");
@@ -424 +427 @@
  }
 
+ if ( midi_init_config() == -1 ) {
+  ROAR_ERR("Can not init MIDI config!");
+  return 1;
+ }
 
 #ifdef ROAR_SUPPORT_LISTEN
@@ -572 +579 @@
   } else if ( strcmp(k, "--light-channels") == 0 ) {
    light_channels = atoi(argv[++i]);
+
+  } else if ( strcmp(k, "--midi-no-console") == 0 ) {
+   midi_config.init_cb = 0;
+  } else if ( strcmp(k, "--midi-console") == 0 ) {
+   midi_config.console_dev = argv[++i];
 
   } else if ( strcmp(k, "-p") == 0 || strcmp(k, "--port") == 0 ) {