Changeset 3543:af952b03e304 in roaraudio for libroardsp
- Timestamp:
- 02/20/10 01:39:34 (14 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroardsp/channels.c
r3541 r3543 31 31 char * sn; 32 32 } _g_chans[] = { 33 // general: 33 34 {ROARDSP_CHAN_NONE, "NONE", "NONE" }, 35 // waveform: 34 36 {ROARDSP_CHAN_FRONT_LEFT, "FRONT_LEFT", "FL" }, 35 37 {ROARDSP_CHAN_FRONT_RIGHT, "FRONT_RIGHT", "FR" }, … … 48 50 {ROARDSP_CHAN_MS_SIDE, "MS_SIDE", "SIDE" }, 49 51 {ROARDSP_CHAN_LFE, "LFE", "LFE" }, 52 // midi: 53 {ROARDSP_CHAN_MIDI0, "MIDI0", NULL }, 54 {ROARDSP_CHAN_MIDI1, "MIDI1", NULL }, 55 {ROARDSP_CHAN_MIDI2, "MIDI2", NULL }, 56 {ROARDSP_CHAN_MIDI3, "MIDI3", NULL }, 57 {ROARDSP_CHAN_MIDI4, "MIDI4", NULL }, 58 {ROARDSP_CHAN_MIDI5, "MIDI5", NULL }, 59 {ROARDSP_CHAN_MIDI6, "MIDI6", NULL }, 60 {ROARDSP_CHAN_MIDI7, "MIDI7", NULL }, 61 {ROARDSP_CHAN_MIDI8, "MIDI8", NULL }, 62 {ROARDSP_CHAN_MIDI9, "MIDI9", NULL }, 63 {ROARDSP_CHAN_MIDI10, "MIDI10", NULL }, 64 {ROARDSP_CHAN_MIDI11, "MIDI11", NULL }, 65 {ROARDSP_CHAN_MIDI12, "MIDI12", NULL }, 66 {ROARDSP_CHAN_MIDI13, "MIDI13", NULL }, 67 {ROARDSP_CHAN_MIDI14, "MIDI14", NULL }, 68 {ROARDSP_CHAN_MIDI15, "MIDI15", NULL }, 50 69 {ROARDSP_CHAN_EOL, NULL, NULL} 51 70 }; … … 65 84 66 85 for (i = 0; _g_chans[i].id != ROARDSP_CHAN_EOL; i++) 67 if ( !strcasecmp(_g_chans[i].name, str) || !strcasecmp(_g_chans[i].sn, str) ) 86 if ( !strcasecmp(_g_chans[i].name, str) || 87 (_g_chans[i].sn != NULL && !strcasecmp(_g_chans[i].sn, str)) ) 68 88 return _g_chans[i].id; 69 89 … … 101 121 102 122 int roardsp_chanlist_init(char * list, int channels, int map) { 123 int i; 124 103 125 if ( channels == 0 ) 104 126 return 0; … … 109 131 if ( channels > ROAR_MAX_CHANNELS ) 110 132 return -1; 133 134 if ( map == ROARDSP_CHANLIST_MAP_MIDI ) { 135 for (i = 0; i < channels; i++) { 136 list[i] = i+ROARDSP_CHAN_MIDI0; 137 } 138 } 111 139 112 140 // test for common maps:
Note: See TracChangeset
for help on using the changeset viewer.