projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ensure that each and every audioengine-related thread has a unique name
[ardour.git]
/
libs
/
ardour
/
midi_clock_slave.cc
diff --git
a/libs/ardour/midi_clock_slave.cc
b/libs/ardour/midi_clock_slave.cc
index 762d94469c3b0393a467fd2459a84b52e4d9e007..8c95272fde239987e8f13edcec63021fc82bff34 100644
(file)
--- a/
libs/ardour/midi_clock_slave.cc
+++ b/
libs/ardour/midi_clock_slave.cc
@@
-20,7
+20,6
@@
#include <cmath>
#include <errno.h>
#include <cmath>
#include <errno.h>
-#include <poll.h>
#include <sys/types.h>
#include <unistd.h>
#include "pbd/error.h"
#include <sys/types.h>
#include <unistd.h>
#include "pbd/error.h"
@@
-261,7
+260,7
@@
MIDIClock_Slave::stop (Parser& /*parser*/, framepos_t /*timestamp*/)
}
void
}
void
-MIDIClock_Slave::position (Parser& /*parser*/, byte* message, size_t size)
+MIDIClock_Slave::position (Parser& /*parser*/,
MIDI::
byte* message, size_t size)
{
// we are note supposed to get position messages while we are running
// so lets be robust and ignore those
{
// we are note supposed to get position messages while we are running
// so lets be robust and ignore those
@@
-270,8
+269,8
@@
MIDIClock_Slave::position (Parser& /*parser*/, byte* message, size_t size)
}
assert(size == 3);
}
assert(size == 3);
- byte lsb = message[1];
- byte msb = message[2];
+
MIDI::
byte lsb = message[1];
+
MIDI::
byte msb = message[2];
assert((lsb <= 0x7f) && (msb <= 0x7f));
uint16_t position_in_sixteenth_notes = (uint16_t(msb) << 7) | uint16_t(lsb);
assert((lsb <= 0x7f) && (msb <= 0x7f));
uint16_t position_in_sixteenth_notes = (uint16_t(msb) << 7) | uint16_t(lsb);