projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge with master
[ardour.git]
/
libs
/
midi++2
/
mmc.cc
diff --git
a/libs/midi++2/mmc.cc
b/libs/midi++2/mmc.cc
index a3f8f01fe429a9ddac80ac11a1772d0a9d90f19c..b92e686ce6b753bca71bea99b2b2be0b5fa70c98 100644
(file)
--- a/
libs/midi++2/mmc.cc
+++ b/
libs/midi++2/mmc.cc
@@
-30,6
+30,10
@@
#include "midi++/port.h"
#include "midi++/parser.h"
#include "midi++/port.h"
#include "midi++/parser.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;
using namespace std;
using namespace MIDI;
using namespace PBD;
@@
-226,19
+230,19
@@
MachineControl::set_ports (MIDI::Port* ip, MIDI::Port* op)
}
void
}
void
-MachineControl::set_receive_device_id (byte id)
+MachineControl::set_receive_device_id (
MIDI::
byte id)
{
_receive_device_id = id & 0x7f;
}
void
{
_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
{
_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;
{
if (len < 4 || len > 48) {
return false;
@@
-257,7
+261,7
@@
MachineControl::is_mmc (byte *sysex_buf, size_t len)
}
void
}
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;
{
size_t skiplen;
byte *mmc_msg;
@@
-464,7
+468,7
@@
MachineControl::process_mmc_message (Parser &, byte *msg, size_t len)
}
int
}
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" */
{
/* return the number of bytes "consumed" */
@@
-490,7
+494,7
@@
MachineControl::do_masked_write (byte *msg, size_t len)
}
void
}
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;
{
size_t n;
ssize_t base_track;
@@
-579,7
+583,7
@@
MachineControl::write_track_status (byte *msg, size_t /*len*/, byte reg)
}
int
}
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"
{
if (msg[2] == 0) {
warning << "MIDI::MMC: locate [I/F] command not supported"
@@
-594,7
+598,7
@@
MachineControl::do_locate (byte *msg, size_t /*msglen*/)
}
int
}
int
-MachineControl::do_step (byte *msg, size_t /*msglen*/)
+MachineControl::do_step (
MIDI::
byte *msg, size_t /*msglen*/)
{
int steps = msg[2] & 0x3f;
{
int steps = msg[2] & 0x3f;
@@
-607,7
+611,7
@@
MachineControl::do_step (byte *msg, size_t /*msglen*/)
}
int
}
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];
{
size_t forward;
byte sh = msg[2];