clap

commit 83b3309ac2bf92aba1bd962a2b91a2232ab04ec6
parent c0226d7e71dadd0dad8825e920cd119e2934d508
Author: Alexandre Bique <bique.alexandre@gmail.com>
Date:   Fri, 30 Sep 2016 15:17:00 +0200

Refactoring, build fixes

Diffstat:
M
include/clap/helpers/midi-parser.c
 | 
18
+++++++++---------
M
include/clap/helpers/midi-parser.h
 | 
2
+-
M
tests/midi-parser/midi-parser.c
 | 
8
++++----
M
tools/clap-info/clap-info.c
 | 
8
--------

4 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/include/clap/helpers/midi-parser.c b/include/clap/helpers/midi-parser.c
@@ -234,10 +234,10 @@ clap_midi_parse_channel_event(struct clap_midi_parser *parser)
   if (parser->size < 3)
     return CLAP_MIDI_PARSER_EOB;
 
-  parser->channel.status  = parser->in[0] >> 4;
-  parser->channel.channel = parser->in[0] & 0xf;
-  parser->channel.param1  = parser->in[1];
-  parser->channel.param2  = parser->in[2];
+  parser->midi.status  = parser->in[0] >> 4;
+  parser->midi.channel = parser->in[0] & 0xf;
+  parser->midi.param1  = parser->in[1];
+  parser->midi.param2  = parser->in[2];
 
   parser->in         += 3;
   parser->size       -= 3;
@@ -322,18 +322,18 @@ clap_midi_convert(const uint8_t     *in,
   enum clap_midi_parser_status status = clap_midi_parse(&parser);
   switch (status) {
   case CLAP_MIDI_PARSER_TRACK_MIDI:
-    switch (parser.channel.status) {
+    switch (parser.midi.status) {
     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.key      = parser.midi.param1;
+      event->note.velocity = ((float)parser.midi.param2) / 127.0f;
       event->note.pitch    = clap_midi_pitches[event->note.key];
       return;
 
     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;
+      event->note.key      = parser.midi.param1;
+      event->note.velocity = ((float)parser.midi.param2) / 127.0f;
       event->note.pitch    = clap_midi_pitches[event->note.key];
       return;
     }
diff --git a/include/clap/helpers/midi-parser.h b/include/clap/helpers/midi-parser.h
@@ -166,7 +166,7 @@ struct clap_midi_parser
   int64_t                        vtime;
   struct clap_midi_header        header;
   struct clap_midi_track         track;
-  struct clap_midi_channel_event channel;
+  struct clap_midi_channel_event midi;
   struct clap_midi_meta_event    meta;
   struct clap_midi_sysex_event   sysex;
 };
diff --git a/tests/midi-parser/midi-parser.c b/tests/midi-parser/midi-parser.c
@@ -47,10 +47,10 @@ void parse_and_dump(struct clap_midi_parser *parser)
     case CLAP_MIDI_PARSER_TRACK_MIDI:
       puts("track-midi");
       printf("  time: %d\n", parser->vtime);
-      printf("  status: %d [%s]\n", parser->channel.status, clap_midi_status_name(parser->channel.status));
-      printf("  channel: %d\n", parser->channel.channel);
-      printf("  param1: %d\n", parser->channel.param1);
-      printf("  param2: %d\n", parser->channel.param2);
+      printf("  status: %d [%s]\n", parser->midi.status, clap_midi_status_name(parser->midi.status));
+      printf("  channel: %d\n", parser->midi.channel);
+      printf("  param1: %d\n", parser->midi.param1);
+      printf("  param2: %d\n", parser->midi.param2);
       break;
 
     case CLAP_MIDI_PARSER_TRACK_META:
diff --git a/tools/clap-info/clap-info.c b/tools/clap-info/clap-info.c
@@ -4,12 +4,6 @@
 #include <clap/clap.h>
 #include <clap/ext/params.h>
 
-static void host_events(struct clap_host   *host,
-                        struct clap_plugin *plugin,
-                        struct clap_event  *events)
-{
-}
-
 static void *host_extension(struct clap_host *host, const char *extension_id)
 {
   return NULL;
@@ -20,8 +14,6 @@ static void initialize_host(struct clap_host *host)
   static int64_t steady_time = 0;
 
   host->clap_version = CLAP_VERSION;
-  host->events       = host_events;
-  host->steady_time  = &steady_time;
   host->extension    = host_extension;
 }