summaryrefslogtreecommitdiff
path: root/libs/ardour/session_midi.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2008-03-19 18:10:51 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2008-03-19 18:10:51 +0000
commit4808f7fe8b4208ab1cd1fcb505867092272d726c (patch)
tree5083fc38a65b12fd3aedfbd7ad618a69cee8dabc /libs/ardour/session_midi.cc
parentd9faaed2c1371ba8bfc04bd6bd69c23bcbe1b143 (diff)
fix up and re-enable MTC transmission
git-svn-id: svn://localhost/ardour2/branches/3.0@3158 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_midi.cc')
-rw-r--r--libs/ardour/session_midi.cc17
1 files changed, 6 insertions, 11 deletions
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index 56c5221836..d877c158b8 100644
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -748,22 +748,17 @@ Session::send_midi_time_code_for_cycle(nframes_t nframes)
assert (next_quarter_frame_to_send >= 0);
assert (next_quarter_frame_to_send <= 7);
- if (next_quarter_frame_to_send < 0)
- {
- printf("Negative????\n");
- }
-
if (_mtc_port == 0 || !session_send_mtc || transmitting_smpte_time.negative
- /*|| (next_quarter_frame_to_send < 0)*/ ) {
- //printf("(MTC) Not sending MTC\n");
+ /*|| (next_quarter_frame_to_send < 0)*/ ) {
+ // cerr << "(MTC) Not sending MTC\n";
return 0;
}
/* Duration of one quarter frame */
nframes_t quarter_frame_duration = ((long) _frames_per_smpte_frame) >> 2;
- //cerr << "(MTC) TR: " << _transport_frame << " - SF: " << outbound_mtc_smpte_frame
- //<< " - NQ: " << next_quarter_frame_to_send << " - FD" << quarter_frame_duration << endl;
+ // cerr << "(MTC) TR: " << _transport_frame << " - SF: " << outbound_mtc_smpte_frame
+ // << " - NQ: " << next_quarter_frame_to_send << " - FD" << quarter_frame_duration << endl;
// FIXME: this should always be true
//assert((outbound_mtc_smpte_frame + (next_quarter_frame_to_send * quarter_frame_duration))
@@ -773,8 +768,8 @@ Session::send_midi_time_code_for_cycle(nframes_t nframes)
// Send quarter frames for this cycle
while (_transport_frame + nframes > (outbound_mtc_smpte_frame +
(next_quarter_frame_to_send * quarter_frame_duration))) {
-
- //cerr << "(MTC) Next frame to send: " << next_quarter_frame_to_send << endl;
+
+ // cerr << "(MTC) Next frame to send: " << next_quarter_frame_to_send << endl;
switch (next_quarter_frame_to_send) {
case 0: