projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wiimote surface support changes actions recently moved to Common/*
[ardour.git]
/
libs
/
ardour
/
mididm.cc
diff --git
a/libs/ardour/mididm.cc
b/libs/ardour/mididm.cc
index 8fe6b504602caf35e7725e4741611694acbf68d7..0888d154e915cb6a7d63a11da47bc8e9b96a8113 100644
(file)
--- a/
libs/ardour/mididm.cc
+++ b/
libs/ardour/mididm.cc
@@
-45,7
+45,7
@@
MIDIDM::parse_mclk (uint8_t* buf, pframes_t timestamp) const
const int64_t ti = ((buf[2] & 0x7f) << 7) | (buf[1] & 0x7f);
const int64_t tdiff = (MODCLK + tc - ti) % MODCLK;
#ifdef DEBUG_MIDIDM
const int64_t ti = ((buf[2] & 0x7f) << 7) | (buf[1] & 0x7f);
const int64_t tdiff = (MODCLK + tc - ti) % MODCLK;
#ifdef DEBUG_MIDIDM
- printf("MCLK DELAY: #
%5"PRId64" %5"PRId64" [samples] (%5"PRId64" - %8"PRId64") @(%5
"PRId64" + %d)\n",
+ printf("MCLK DELAY: #
%5"PRId64" dt:%6"PRId64" [spl] (%6"PRId64" - %8"PRId64") @(%8
"PRId64" + %d)\n",
_cnt_total, tdiff, tc, ti, _monotonic_cnt, timestamp);
#endif
return tdiff;
_cnt_total, tdiff, tc, ti, _monotonic_cnt, timestamp);
#endif
return tdiff;
@@
-62,7
+62,7
@@
MIDIDM::parse_mtc (uint8_t* buf, pframes_t timestamp) const
| ((buf[8] & 0x7f) << 21);
const int64_t tdiff = (MODTC + tc - ti) % MODTC;
#ifdef DEBUG_MIDIDM
| ((buf[8] & 0x7f) << 21);
const int64_t tdiff = (MODTC + tc - ti) % MODTC;
#ifdef DEBUG_MIDIDM
- printf("MTC DELAY: #
%5"PRId64" %5"PRId64" [samples] (%5"PRId64" - %8"PRId64") @(%5
"PRId64" + %d)\n",
+ printf("MTC DELAY: #
%5"PRId64" dt:%6"PRId64" [spl] (%6"PRId64" - %8"PRId64") @(%8
"PRId64" + %d)\n",
_cnt_total, tdiff, tc, ti, _monotonic_cnt, timestamp);
#endif
return tdiff;
_cnt_total, tdiff, tc, ti, _monotonic_cnt, timestamp);
#endif
return tdiff;
@@
-79,7
+79,7
@@
int MIDIDM::process (pframes_t nframes, PortEngine &pe, void *midi_in, void *mid
obuf[2] = (_monotonic_cnt >> 7) & 0x7f;
pe.midi_event_put (midi_out, 0, obuf, 3);
#else // sysex MTC frame
obuf[2] = (_monotonic_cnt >> 7) & 0x7f;
pe.midi_event_put (midi_out, 0, obuf, 3);
#else // sysex MTC frame
- uint8_t obuf[
9
];
+ uint8_t obuf[
10
];
obuf[0] = 0xf0;
obuf[1] = 0x7f;
obuf[2] = 0x7f;
obuf[0] = 0xf0;
obuf[1] = 0x7f;
obuf[2] = 0x7f;