summaryrefslogtreecommitdiff
path: root/libs/midi++2/mtc.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-12-01 18:31:00 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-12-01 18:31:00 +0000
commitb825b86862223862f2cd23e08d204b2de657b4b7 (patch)
tree3d0459a362000625c82d51886d0b9ba3b79f1201 /libs/midi++2/mtc.cc
parentce2d9cb4aacae917fd9117d923f124a8d5ecde2d (diff)
generalize hans' midi_clock_timestamp to be a general timestamp for incoming MIDI data (from JACK); make JACK_MidiPort::read() abort, because it should never ever be called; make JACK_MidiPort::~JackMIDIPort() unregister ports when it is destroyed; pass along the timestamp to MTC qtr and full signals
git-svn-id: svn://localhost/ardour2/branches/3.0@6254 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2/mtc.cc')
-rw-r--r--libs/midi++2/mtc.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/midi++2/mtc.cc b/libs/midi++2/mtc.cc
index 55ceb97b8f..74b528e5e3 100644
--- a/libs/midi++2/mtc.cc
+++ b/libs/midi++2/mtc.cc
@@ -61,7 +61,7 @@ Parser::possible_mtc (byte *sysex_buf, size_t msglen)
/* emit signals */
mtc (*this, &sysex_buf[1], msglen - 1);
- mtc_time (fake_mtc_time, true);
+ mtc_time (fake_mtc_time, true, _timestamp);
mtc_status (MTC_Stopped);
return true;
@@ -276,7 +276,7 @@ Parser::process_mtc_quarter_frame (byte *msg)
}
- mtc_qtr (*this, which_quarter_frame); /* EMIT_SIGNAL */
+ mtc_qtr (*this, which_quarter_frame, _timestamp); /* EMIT_SIGNAL */
// mtc (*this, &msg[1], msglen - 1);
@@ -296,7 +296,7 @@ Parser::process_mtc_quarter_frame (byte *msg)
_mtc_locked = true;
}
- mtc_time (_mtc_time, false);
+ mtc_time (_mtc_time, false, _timestamp);
}
expected_mtc_quarter_frame_code = 0;
@@ -319,7 +319,7 @@ Parser::process_mtc_quarter_frame (byte *msg)
if (!_mtc_locked) {
_mtc_locked = true;
}
- mtc_time (_mtc_time, false);
+ mtc_time (_mtc_time, false, _timestamp);
}
expected_mtc_quarter_frame_code = 7;