X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fmidi%2B%2B2%2Fparser.cc;h=453fede251255b190ec9f720999fd6debe98351e;hb=077a194430f9e1c66b6ad3526ff8a54ecf390c5f;hp=a56e3f82e4d964976d774220b0ff4258a7e7d5f1;hpb=1660f00ff3777b2bd52a4c73fe9aa43050f8ad34;p=ardour.git diff --git a/libs/midi++2/parser.cc b/libs/midi++2/parser.cc index a56e3f82e4..453fede251 100644 --- a/libs/midi++2/parser.cc +++ b/libs/midi++2/parser.cc @@ -30,7 +30,7 @@ #include "midi++/types.h" #include "midi++/parser.h" -#include "midi++/port_base.h" +#include "midi++/port.h" #include "midi++/mmc.h" #include "pbd/transmitter.h" @@ -104,8 +104,7 @@ Parser::midi_event_type_name (eventType t) } } -Parser::Parser (PortBase &p) - : _port(p) +Parser::Parser () { trace_stream = 0; trace_prefix = ""; @@ -133,11 +132,11 @@ Parser::Parser (PortBase &p) Parser::~Parser () { - delete msgbuf; + free (msgbuf); } void -Parser::trace_event (Parser &, byte *msg, size_t len) +Parser::trace_event (Parser &, MIDI::byte *msg, size_t len) { eventType type; ostream *o; @@ -659,7 +658,7 @@ Parser::system_msg (unsigned char inbyte) } void -Parser::signal (byte *msg, size_t len) +Parser::signal (MIDI::byte *msg, size_t len) { channel_t chan = msg[0]&0xF; int chan_i = chan; @@ -762,7 +761,7 @@ Parser::signal (byte *msg, size_t len) } bool -Parser::possible_mmc (byte *msg, size_t msglen) +Parser::possible_mmc (MIDI::byte *msg, size_t msglen) { if (!MachineControl::is_mmc (msg, msglen)) { return false;