X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fmidi%2B%2B2%2Fparser.cc;h=453fede251255b190ec9f720999fd6debe98351e;hb=09687c171239977021af42a7d706af39d0df0173;hp=8f416a9717e38fde9bc8ff50ffa16f26c724ea13;hpb=127b8a62b790c7515a27934b920e88b7de04b7fc;p=ardour.git

diff --git a/libs/midi++2/parser.cc b/libs/midi++2/parser.cc
index 8f416a9717..453fede251 100644
--- a/libs/midi++2/parser.cc
+++ b/libs/midi++2/parser.cc
@@ -35,7 +35,6 @@
 #include "pbd/transmitter.h"
 
 using namespace std;
-using namespace sigc;
 using namespace MIDI;
 
 const char *
@@ -105,9 +104,7 @@ Parser::midi_event_type_name (eventType t)
 	}
 }
 
-Parser::Parser (Port &p) 
-	: _port (p)
-
+Parser::Parser () 
 {
 	trace_stream = 0;
 	trace_prefix = "";
@@ -135,11 +132,11 @@ Parser::Parser (Port &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;
@@ -314,10 +311,9 @@ Parser::trace (bool onoff, ostream *o, const string &prefix)
 	trace_connection.disconnect ();
 
 	if (onoff) {
-		cerr << "enabling tracing for port " << _port.name() << endl;
 		trace_stream = o;
 		trace_prefix = prefix;
-		trace_connection = any.connect (mem_fun (*this, &Parser::trace_event));
+		any.connect_same_thread (trace_connection, boost::bind (&Parser::trace_event, this, _1, _2, _3));
 	} else {
 		trace_prefix = "";
 		trace_stream = 0;
@@ -328,9 +324,10 @@ void
 Parser::scanner (unsigned char inbyte)
 {
 	bool statusbit;
+        boost::optional<int> edit_result;
 
 	// cerr << "parse: " << hex << (int) inbyte << dec << " state = " << state << " msgindex = " << msgindex << " runnable = " << runnable << endl;
-
+	
 	/* Check active sensing early, so it doesn't interrupt sysex. 
 	   
 	   NOTE: active sense messages are not considered to fit under
@@ -388,9 +385,11 @@ Parser::scanner (unsigned char inbyte)
 	}
 
 	if (rtmsg) {
-		if (edit (&inbyte, 1) >= 0 && !_offline) {
+		boost::optional<int> res = edit (&inbyte, 1);
+		
+		if (res.get_value_or (1) >= 0 && !_offline) {
 			realtime_msg (inbyte);
-		}
+		} 
 		
 		return;
 	} 
@@ -403,8 +402,9 @@ Parser::scanner (unsigned char inbyte)
 	 * an EOX.  Actually, since EOX is a status byte, this
 	 * code ALWAYS handles the end of a VARIABLELENGTH message.
 	 */
-	
+
 	if (state == VARIABLELENGTH && statusbit)  {
+
 		/* The message has ended, so process it */
 
 		/* add EOX to any sysex message */
@@ -420,16 +420,21 @@ Parser::scanner (unsigned char inbyte)
 		}
 		cerr << dec << endl;
 #endif
-		if (msgindex > 0 && edit (msgbuf, msgindex) >= 0) {
-			if (!possible_mmc (msgbuf, msgindex) || _mmc_forward) {
-				if (!possible_mtc (msgbuf, msgindex) || _mtc_forward) {
-					if (!_offline) {
-						sysex (*this, msgbuf, msgindex);
+		if (msgindex > 0) {
+
+			boost::optional<int> res = edit (msgbuf, msgindex);
+
+			if (res.get_value_or (1) >= 0) {
+				if (!possible_mmc (msgbuf, msgindex) || _mmc_forward) {
+					if (!possible_mtc (msgbuf, msgindex) || _mtc_forward) {
+						if (!_offline) {
+							sysex (*this, msgbuf, msgindex);
+						}
 					}
 				}
-			}
-			if (!_offline) {
-				any (*this, msgbuf, msgindex);
+				if (!_offline) {
+					any (*this, msgbuf, msgindex);
+				} 
 			}
 		}
 	}
@@ -491,8 +496,10 @@ Parser::scanner (unsigned char inbyte)
 		
 	case NEEDONEBYTE:
 		/* We've completed a 1 or 2 byte message. */
-		
-		if (edit (msgbuf, msgindex) == 0) {
+
+                edit_result = edit (msgbuf, msgindex);
+                
+		if (edit_result.get_value_or (1)) {
 			
 			/* message not cancelled by an editor */
 			
@@ -538,16 +545,16 @@ Parser::realtime_msg(unsigned char inbyte)
 
 	switch (inbyte) {
 	case 0xf8:
-		timing (*this, _midi_clock_timestamp);
+		timing (*this, _timestamp);
 		break;
 	case 0xfa:
-		start (*this, _midi_clock_timestamp);
+		start (*this, _timestamp);
 		break;
 	case 0xfb:
-		contineu (*this, _midi_clock_timestamp);
+		contineu (*this, _timestamp);
 		break;
 	case 0xfc:
-		stop (*this, _midi_clock_timestamp);
+		stop (*this, _timestamp);
 		break;
 	case 0xfe:
 		/* !!! active sense message in realtime_msg: should not reach here
@@ -651,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;
@@ -754,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;