From 369c0e4a6692f7f5fd356783be7da773e452cb34 Mon Sep 17 00:00:00 2001
From: John Emmas <johne53@tiscali.co.uk>
Date: Thu, 25 Jul 2013 07:19:51 +0100
Subject: 'libs/midi++2' - Modify to be buildable with MSVC

---
 libs/midi++2/mmc.cc | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'libs/midi++2/mmc.cc')

diff --git a/libs/midi++2/mmc.cc b/libs/midi++2/mmc.cc
index 06eadb5b34..1b8de40358 100644
--- a/libs/midi++2/mmc.cc
+++ b/libs/midi++2/mmc.cc
@@ -29,6 +29,10 @@
 #include "midi++/parser.h"
 #include "midi++/manager.h"
 
+#ifndef __INT_MAX__   // 'ssize_t' won't be defined yet
+typedef long ssize_t;
+#endif
+
 using namespace std;
 using namespace MIDI;
 using namespace PBD;
@@ -213,19 +217,19 @@ MachineControl::MachineControl (Manager* m, jack_client_t* jack)
 }
 
 void
-MachineControl::set_receive_device_id (byte id)
+MachineControl::set_receive_device_id (MIDI::byte id)
 {
 	_receive_device_id = id & 0x7f;
 }
 
 void
-MachineControl::set_send_device_id (byte id)
+MachineControl::set_send_device_id (MIDI::byte id)
 {
 	_send_device_id = id & 0x7f;
 }
 
 bool
-MachineControl::is_mmc (byte *sysex_buf, size_t len)
+MachineControl::is_mmc (MIDI::byte *sysex_buf, size_t len)
 {
 	if (len < 4 || len > 48) {
 		return false;
@@ -244,7 +248,7 @@ MachineControl::is_mmc (byte *sysex_buf, size_t len)
 }
 
 void
-MachineControl::process_mmc_message (Parser &, byte *msg, size_t len)
+MachineControl::process_mmc_message (Parser &, MIDI::byte *msg, size_t len)
 {
 	size_t skiplen;
 	byte *mmc_msg;
@@ -451,7 +455,7 @@ MachineControl::process_mmc_message (Parser &, byte *msg, size_t len)
 }		
 
 int
-MachineControl::do_masked_write (byte *msg, size_t len)
+MachineControl::do_masked_write (MIDI::byte *msg, size_t len)
 {
 	/* return the number of bytes "consumed" */
 
@@ -477,7 +481,7 @@ MachineControl::do_masked_write (byte *msg, size_t len)
 }
 
 void
-MachineControl::write_track_status (byte *msg, size_t /*len*/, byte reg)
+MachineControl::write_track_status (MIDI::byte *msg, size_t /*len*/, MIDI::byte reg)
 {
 	size_t n;
 	ssize_t base_track;
@@ -566,7 +570,7 @@ MachineControl::write_track_status (byte *msg, size_t /*len*/, byte reg)
 }
 
 int
-MachineControl::do_locate (byte *msg, size_t /*msglen*/)
+MachineControl::do_locate (MIDI::byte *msg, size_t /*msglen*/)
 {
 	if (msg[2] == 0) {
 		warning << "MIDI::MMC: locate [I/F] command not supported"
@@ -581,7 +585,7 @@ MachineControl::do_locate (byte *msg, size_t /*msglen*/)
 }
 
 int
-MachineControl::do_step (byte *msg, size_t /*msglen*/)
+MachineControl::do_step (MIDI::byte *msg, size_t /*msglen*/)
 {
 	int steps = msg[2] & 0x3f;
 
@@ -594,7 +598,7 @@ MachineControl::do_step (byte *msg, size_t /*msglen*/)
 }
 
 int
-MachineControl::do_shuttle (byte *msg, size_t /*msglen*/)
+MachineControl::do_shuttle (MIDI::byte *msg, size_t /*msglen*/)
 {
 	size_t forward;
 	byte sh = msg[2];
-- 
cgit v1.2.3