diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-12-03 22:26:29 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-12-03 22:26:29 +0000 |
| commit | 73192bc1a7ea55fa1864dc3826845b15c00dd2ec (patch) | |
| tree | c0039f3f5a848aed6e880abf11519dad855fa899 /libs/ardour/session_midi.cc | |
| parent | 74b4a3c77b08dc1e58274875604eb73e8492fa93 (diff) | |
Remove all use of nframes_t.
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_midi.cc')
| -rw-r--r-- | libs/ardour/session_midi.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index 6914b9db94..ee43a7263a 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -90,7 +90,7 @@ Session::setup_midi_control () } void -Session::spp_start (Parser &, nframes_t /*timestamp*/) +Session::spp_start (Parser &, framepos_t /*timestamp*/) { if (Config->get_mmc_control() && (!config.get_external_sync() || config.get_sync_source() != JACK)) { request_transport_speed (1.0); @@ -98,13 +98,13 @@ Session::spp_start (Parser &, nframes_t /*timestamp*/) } void -Session::spp_continue (Parser& ignored, nframes_t timestamp) +Session::spp_continue (Parser& ignored, framepos_t timestamp) { spp_start (ignored, timestamp); } void -Session::spp_stop (Parser&, nframes_t /*timestamp*/) +Session::spp_stop (Parser&, framepos_t /*timestamp*/) { if (Config->get_mmc_control()) { request_stop (); @@ -373,7 +373,7 @@ Session::send_full_time_code (framepos_t const t) if (((mtc_timecode_bits >> 5) != MIDI::MTC_25_FPS) && (transmitting_timecode_time.frames % 2)) { // start MTC quarter frame transmission on an even frame Timecode::increment (transmitting_timecode_time, config.get_subframes_per_frame()); - outbound_mtc_timecode_frame += (nframes_t) _frames_per_timecode_frame; + outbound_mtc_timecode_frame += _frames_per_timecode_frame; } // Compensate for audio latency @@ -410,7 +410,7 @@ Session::send_full_time_code (framepos_t const t) * earlier already this cycle by send_full_time_code) */ int -Session::send_midi_time_code_for_cycle(nframes_t nframes) +Session::send_midi_time_code_for_cycle (pframes_t nframes) { if (_slave || !session_send_mtc || transmitting_timecode_time.negative || (next_quarter_frame_to_send < 0)) { // cerr << "(MTC) Not sending MTC\n"; @@ -421,7 +421,7 @@ Session::send_midi_time_code_for_cycle(nframes_t nframes) assert (next_quarter_frame_to_send <= 7); /* Duration of one quarter frame */ - nframes_t quarter_frame_duration = ((nframes_t) _frames_per_timecode_frame) >> 2; + framecnt_t quarter_frame_duration = ((framecnt_t) _frames_per_timecode_frame) >> 2; DEBUG_TRACE (DEBUG::MTC, string_compose ("TF %1 SF %2 NQ %3 FD %4\n", _transport_frame, outbound_mtc_timecode_frame, next_quarter_frame_to_send, quarter_frame_duration)); @@ -463,14 +463,14 @@ Session::send_midi_time_code_for_cycle(nframes_t nframes) break; } - const nframes_t msg_time = (outbound_mtc_timecode_frame + const framepos_t msg_time = (outbound_mtc_timecode_frame + (quarter_frame_duration * next_quarter_frame_to_send)); // This message must fall within this block or something is broken assert(msg_time >= _transport_frame); assert(msg_time < _transport_frame + nframes); - nframes_t out_stamp = msg_time - _transport_frame; + framepos_t out_stamp = msg_time - _transport_frame; assert(out_stamp < nframes); if (MIDI::Manager::instance()->mtc_output_port()->midimsg (mtc_msg, 2, out_stamp)) { |