clap

CLAP Audio Plugin API
Log | Files | Refs | README | LICENSE

commit 70a37137286944779020bc15a2eff4911599288c
parent 33870d38ec7ba6376b0c61d0c12299e591d88488
Author: Alexandre Bique <bique.alexandre@gmail.com>
Date:   Thu, 29 Sep 2016 15:41:40 +0200

Better names

Diffstat:
Minclude/clap/helpers/midi-parser.c | 4++--
Minclude/clap/helpers/midi-parser.h | 34++++++++++++++++++++++++++--------
Mtests/midi-parser/midi-parser.c | 2+-
3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/include/clap/helpers/midi-parser.c b/include/clap/helpers/midi-parser.c @@ -320,14 +320,14 @@ clap_midi_convert(const uint8_t *in, switch (status) { case CLAP_MIDI_PARSER_TRACK_MIDI: switch (parser.channel.event_type) { - case CLAP_MIDI_CHANNEL_NOTE_OFF: + case CLAP_MIDI_STATUS_NOTE_OFF: event->type = CLAP_EVENT_NOTE_OFF; event->note.key = parser.channel.param1; event->note.velocity = ((float)parser.channel.param2) / 127.0f; event->note.pitch = clap_midi_pitches[event->note.key]; return; - case CLAP_MIDI_CHANNEL_NOTE_ON: + case CLAP_MIDI_STATUS_NOTE_ON: event->type = CLAP_EVENT_NOTE_ON; event->note.key = parser.channel.param1; event->note.velocity = ((float)parser.channel.param2) / 127.0f; diff --git a/include/clap/helpers/midi-parser.h b/include/clap/helpers/midi-parser.h @@ -38,6 +38,8 @@ clap_midi_file_format_name(int fmt) case CLAP_MIDI_FILE_FORMAT_SINGLE_TRACK: return "single track"; case CLAP_MIDI_FILE_FORMAT_MULTIPLE_TRACKS: return "multiple tracks"; case CLAP_MIDI_FILE_FORMAT_MULTIPLE_SONGS: return "multiple songs"; + + default: return "(unknown)"; } } @@ -54,17 +56,33 @@ struct clap_midi_track int32_t size; }; -enum clap_midi_channel_event_type +enum clap_midi_status { - CLAP_MIDI_CHANNEL_NOTE_OFF = 0x8, - CLAP_MIDI_CHANNEL_NOTE_ON = 0x9, - CLAP_MIDI_CHANNEL_NOTE_AT = 0xA, // after touch - CLAP_MIDI_CHANNEL_CC = 0xB, // control change - CLAP_MIDI_CHANNEL_PGM_CHANGE = 0xC, - CLAP_MIDI_CHANNEL_CHANNEL_AT = 0xD, // after touch - CLAP_MIDI_CHANNEL_PITCH_BEND = 0xE, + CLAP_MIDI_STATUS_NOTE_OFF = 0x8, + CLAP_MIDI_STATUS_NOTE_ON = 0x9, + CLAP_MIDI_STATUS_NOTE_AT = 0xA, // after touch + CLAP_MIDI_STATUS_CC = 0xB, // control change + CLAP_MIDI_STATUS_PGM_CHANGE = 0xC, + CLAP_MIDI_STATUS_CHANNEL_AT = 0xD, // after touch + CLAP_MIDI_STATUS_PITCH_BEND = 0xE, }; +static const char * +clap_midi_status_name(int type) +{ + switch (type) { + case CLAP_MIDI_STATUS_NOTE_OFF: return "Note Off"; + case CLAP_MIDI_STATUS_NOTE_ON: return "Note On"; + case CLAP_MIDI_STATUS_NOTE_AT: return "Note Aftertouch"; + case CLAP_MIDI_STATUS_CC: return "CC"; + case CLAP_MIDI_STATUS_PGM_CHANGE: return "Program Change"; + case CLAP_MIDI_STATUS_CHANNEL_AT: return "Channel Aftertouch"; + case CLAP_MIDI_STATUS_PITCH_BEND: return "Pitch Bend"; + + default: return "(unknown)"; + } +} + struct clap_midi_channel_event { unsigned event_type : 4; diff --git a/tests/midi-parser/midi-parser.c b/tests/midi-parser/midi-parser.c @@ -14,7 +14,7 @@ void usage(const char *prog) void parse_and_dump(struct clap_midi_parser *parser) { - enum clap_midi_channel_event_type status; + enum clap_midi_status status; while (1) { status = clap_midi_parse(parser);