Changeset 3543:af952b03e304 in roaraudio

Timestamp:

02/20/10 01:39:34 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added names for midi channels

Files:

• include/libroardsp/channels.h (modified) (2 diffs)
• libroardsp/channels.c (modified) (5 diffs)

include/libroardsp/channels.h

@@ -93 +93 @@
 #define ROARDSP_CHAN_LFE                  12
 
+// MIDI Channels:
+#define ROARDSP_CHAN_MIDI0                64
+#define ROARDSP_CHAN_MIDI1                65
+#define ROARDSP_CHAN_MIDI2                66
+#define ROARDSP_CHAN_MIDI3                67
+#define ROARDSP_CHAN_MIDI4                68
+#define ROARDSP_CHAN_MIDI5                69
+#define ROARDSP_CHAN_MIDI6                70
+#define ROARDSP_CHAN_MIDI7                71
+#define ROARDSP_CHAN_MIDI8                72
+#define ROARDSP_CHAN_MIDI9                73
+#define ROARDSP_CHAN_MIDI10               74
+#define ROARDSP_CHAN_MIDI11               75
+#define ROARDSP_CHAN_MIDI12               76
+#define ROARDSP_CHAN_MIDI13               77
+#define ROARDSP_CHAN_MIDI14               78
+#define ROARDSP_CHAN_MIDI15               79
+
 #define ROARDSP_CHANLIST_MAP_ROARAUDIO    0
 #define ROARDSP_CHANLIST_MAP_VORBIS       1
@@ -100 +118 @@
 #define ROARDSP_CHANLIST_MAP_ALSA         5
 #define ROARDSP_CHANLIST_MAP_ESD          6
+#define ROARDSP_CHANLIST_MAP_MIDI         7
 
 #define ROARDSP_CHANMAP_IN                0

libroardsp/channels.c

@@ -31 +31 @@
  char * sn;
 } _g_chans[] = {
+ // general:
  {ROARDSP_CHAN_NONE,           "NONE",           "NONE"           },
+ // waveform:
  {ROARDSP_CHAN_FRONT_LEFT,     "FRONT_LEFT",     "FL"             },
  {ROARDSP_CHAN_FRONT_RIGHT,    "FRONT_RIGHT",    "FR"             },
@@ -48 +50 @@
  {ROARDSP_CHAN_MS_SIDE,        "MS_SIDE",        "SIDE"           },
  {ROARDSP_CHAN_LFE,            "LFE",            "LFE"            },
+ // midi:
+ {ROARDSP_CHAN_MIDI0,           "MIDI0",         NULL             },
+ {ROARDSP_CHAN_MIDI1,           "MIDI1",         NULL             },
+ {ROARDSP_CHAN_MIDI2,           "MIDI2",         NULL             },
+ {ROARDSP_CHAN_MIDI3,           "MIDI3",         NULL             },
+ {ROARDSP_CHAN_MIDI4,           "MIDI4",         NULL             },
+ {ROARDSP_CHAN_MIDI5,           "MIDI5",         NULL             },
+ {ROARDSP_CHAN_MIDI6,           "MIDI6",         NULL             },
+ {ROARDSP_CHAN_MIDI7,           "MIDI7",         NULL             },
+ {ROARDSP_CHAN_MIDI8,           "MIDI8",         NULL             },
+ {ROARDSP_CHAN_MIDI9,           "MIDI9",         NULL             },
+ {ROARDSP_CHAN_MIDI10,          "MIDI10",        NULL             },
+ {ROARDSP_CHAN_MIDI11,          "MIDI11",        NULL             },
+ {ROARDSP_CHAN_MIDI12,          "MIDI12",        NULL             },
+ {ROARDSP_CHAN_MIDI13,          "MIDI13",        NULL             },
+ {ROARDSP_CHAN_MIDI14,          "MIDI14",        NULL             },
+ {ROARDSP_CHAN_MIDI15,          "MIDI15",        NULL             },
  {ROARDSP_CHAN_EOL, NULL, NULL}
 };
@@ -65 +84 @@
 
  for (i = 0; _g_chans[i].id != ROARDSP_CHAN_EOL; i++)
-  if ( !strcasecmp(_g_chans[i].name, str) || !strcasecmp(_g_chans[i].sn, str) )
+  if ( !strcasecmp(_g_chans[i].name, str) ||
+       (_g_chans[i].sn != NULL && !strcasecmp(_g_chans[i].sn, str)) )
    return _g_chans[i].id;
 
@@ -101 +121 @@
 
 int    roardsp_chanlist_init(char * list, int channels, int map) {
+ int i;
+
  if ( channels == 0 )
   return 0;
@@ -109 +131 @@
  if ( channels > ROAR_MAX_CHANNELS )
   return -1;
+
+ if ( map == ROARDSP_CHANLIST_MAP_MIDI ) {
+  for (i = 0; i < channels; i++) {
+   list[i] = i+ROARDSP_CHAN_MIDI0;
+  }
+ }
 
  // test for common maps: