aboutsummaryrefslogtreecommitdiffhomepage
path: root/backends
diff options
context:
space:
mode:
authorcbdev <cb@cbcdn.com>2019-03-30 14:34:20 +0100
committercbdev <cb@cbcdn.com>2019-03-30 14:34:20 +0100
commita2b0728027dd8961ef84220c8c8eaf8a81154c71 (patch)
treef0f3454aabe47676f58a4f4b0932dfdae22ef68c /backends
parent56adfff2911ef548406afe8db2841729c957f291 (diff)
downloadmidimonster-a2b0728027dd8961ef84220c8c8eaf8a81154c71.tar.gz
midimonster-a2b0728027dd8961ef84220c8c8eaf8a81154c71.tar.bz2
midimonster-a2b0728027dd8961ef84220c8c8eaf8a81154c71.zip
Fix MIDI mapping syntax
Diffstat (limited to 'backends')
-rw-r--r--backends/midi.c35
1 files changed, 30 insertions, 5 deletions
diff --git a/backends/midi.c b/backends/midi.c
index d856ced..ad7f6fe 100644
--- a/backends/midi.c
+++ b/backends/midi.c
@@ -118,19 +118,30 @@ static channel* midi_channel(instance* instance, char* spec){
.label = 0
};
+ //support deprecated syntax for a transition period...
+ uint8_t old_syntax = 0;
char* channel;
- if(!strncmp(spec, "cc", 2)){
+ if(!strncmp(spec, "ch", 2)){
+ channel = spec + 2;
+ if(!strncmp(spec, "channel", 7)){
+ channel = spec + 7;
+ }
+ }
+ else if(!strncmp(spec, "cc", 2)){
ident.fields.type = cc;
channel = spec + 2;
+ old_syntax = 1;
}
else if(!strncmp(spec, "note", 4)){
ident.fields.type = note;
channel = spec + 4;
+ old_syntax = 1;
}
else if(!strncmp(spec, "nrpn", 4)){
ident.fields.type = nrpn;
channel = spec + 4;
+ old_syntax = 1;
}
else{
fprintf(stderr, "Unknown MIDI channel specification %s\n", spec);
@@ -138,19 +149,33 @@ static channel* midi_channel(instance* instance, char* spec){
}
ident.fields.channel = strtoul(channel, &channel, 10);
-
- //FIXME test this
- if(ident.fields.channel > 16){
+ if(ident.fields.channel > 15){
fprintf(stderr, "MIDI channel out of range in channel spec %s\n", spec);
return NULL;
}
if(*channel != '.'){
- fprintf(stderr, "Need MIDI channel specification of form channel.control, had %s\n", spec);
+ fprintf(stderr, "Need MIDI channel specification of form channel<X>.<control><Y>, had %s\n", spec);
return NULL;
}
+ //skip the period
channel++;
+ if(!old_syntax){
+ if(!strncmp(channel, "cc", 2)){
+ ident.fields.type = cc;
+ channel += 2;
+ }
+ else if(!strncmp(channel, "note", 4)){
+ ident.fields.type = note;
+ channel += 4;
+ }
+ else if(!strncmp(channel, "nrpn", 4)){
+ ident.fields.type = nrpn;
+ channel += 4;
+ }
+ }
+
ident.fields.control = strtoul(channel, NULL, 10);
if(ident.label){