summaryrefslogtreecommitdiff
path: root/libs/ardour/session_midi.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-01-03 23:55:00 +0000
committerCarl Hetherington <carl@carlh.net>2011-01-03 23:55:00 +0000
commitd795980546156b5094a23b465f68c9c9472818b7 (patch)
tree4e55832ce5c8e98b9e6307b459de9d95c42b45ac /libs/ardour/session_midi.cc
parentb3fe29af410d0e809d4c2e5e15e78a064fda63e4 (diff)
Stop QF messages when transport speed is out of range, and re-start them properly.
git-svn-id: svn://localhost/ardour2/branches/3.0@8423 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_midi.cc')
-rw-r--r--libs/ardour/session_midi.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index 31e4e9ca47..f09722f31c 100644
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -360,7 +360,7 @@ Session::send_full_time_code (framepos_t const t)
_send_timecode_update = false;
- if (!session_send_mtc || _slave) {
+ if (!Config->get_send_mtc() || _slave) {
return 0;
}
@@ -413,7 +413,7 @@ Session::send_full_time_code (framepos_t const t)
int
Session::send_midi_time_code_for_cycle (framepos_t start_frame, framepos_t end_frame, pframes_t nframes)
{
- if (_slave || !session_send_mtc || transmitting_timecode_time.negative || (next_quarter_frame_to_send < 0)) {
+ if (_slave || !_send_qf_mtc || transmitting_timecode_time.negative || (next_quarter_frame_to_send < 0)) {
// cerr << "(MTC) Not sending MTC\n";
return 0;
}
@@ -462,7 +462,6 @@ Session::send_midi_time_code_for_cycle (framepos_t start_frame, framepos_t end_f
}
const framepos_t msg_time = outbound_mtc_timecode_frame + (quarter_frame_duration * next_quarter_frame_to_send);
- cout << " " << msg_time << "\n";
// This message must fall within this block or something is broken
assert (msg_time >= start_frame);