* midi_event_size(uchar status): return size including status / handle sysex

git-svn-id: svn://localhost/ardour2/branches/3.0@4486 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 30 insertions, 4 deletions

diff --git a/libs/evoral/evoral/midi_util.h b/libs/evoral/evoral/midi_util.h
index 9a74ee6e12..1d2fe71232 100644
--- a/libs/evoral/evoral/midi_util.h
+++ b/libs/evoral/evoral/midi_util.h
@@ -19,11 +19,13 @@
 #ifndef EVORAL_MIDI_UTIL_H
 #define EVORAL_MIDI_UTIL_H
 
+#include <assert.h>
+
 #include "evoral/midi_events.h"
 
 namespace Evoral {
 
-/** Return the size of the given event NOT including the status byte,
+/** Return the size of the given event NOT the status byte,
  * or -1 if unknown (eg sysex)
  */
 static inline int
@@ -41,13 +43,13 @@ midi_event_size(unsigned char status)
 	case MIDI_CMD_CONTROL:
 	case MIDI_CMD_BENDER:
 	case MIDI_CMD_COMMON_SONG_POS:
-		return 2;
+		return 3;
 
 	case MIDI_CMD_PGM_CHANGE:
 	case MIDI_CMD_CHANNEL_PRESSURE:
 	case MIDI_CMD_COMMON_MTC_QUARTER:
 	case MIDI_CMD_COMMON_SONG_SELECT:
-		return 1;
+		return 2;
 
 	case MIDI_CMD_COMMON_TUNE_REQUEST:
 	case MIDI_CMD_COMMON_SYSEX_END:
@@ -57,7 +59,7 @@ midi_event_size(unsigned char status)
 	case MIDI_CMD_COMMON_STOP:
 	case MIDI_CMD_COMMON_SENSING:
 	case MIDI_CMD_COMMON_RESET:
-		return 0;
+		return 1;
 	
 	case MIDI_CMD_COMMON_SYSEX:
 		return -1;
@@ -66,6 +68,30 @@ midi_event_size(unsigned char status)
 	return -1;
 }
 
+/** Return the size of the given event including the status byte
+ * (which must be the first byte in \a buffer),
+ * or -1 if unknown (eg sysex)
+ */
+static inline int
+midi_event_size(uint8_t* buffer)
+{
+	uint8_t status = buffer[0];
+	
+	// if we have a channel event
+	if (status >= 0x80 && status < 0xF0) {
+		status &= 0xF0; // mask off the channel
+	}
+	
+	if (status == MIDI_CMD_COMMON_SYSEX) {
+		int end;
+		for (end = 1; buffer[end] != MIDI_CMD_COMMON_SYSEX_END; end++);
+		assert(buffer[end] == MIDI_CMD_COMMON_SYSEX_END);
+		return end + 1;
+	} else {
+		return midi_event_size(status);
+	}
+}
+
 } // namespace Evoral
 
 #endif // EVORAL_MIDI_UTIL_H