diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-09-28 17:23:52 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-09-28 17:23:52 +0000 |
| commit | 93c7aeba048f19df5abee5e4325ef8b0ef62c279 (patch) | |
| tree | 5bc2149d17fb5272c5b6284f7e902faad39a92f7 /libs/ardour/session_midi.cc | |
| parent | 3e6feb62ae37cbf98364ccb36e9be47a52ceb8bf (diff) | |
fixes for destructive track offsets of various kinds; move from jack_nframes_t -> nframes_t
git-svn-id: svn://localhost/ardour2/trunk@933 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 2a5b18962c..1af00ca337 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -617,7 +617,7 @@ Session::mmc_locate (MIDI::MachineControl &mmc, const MIDI::byte* mmc_tc) return; } - jack_nframes_t target_frame; + nframes_t target_frame; SMPTE::Time smpte; smpte.hours = mmc_tc[0] & 0xf; @@ -703,8 +703,8 @@ Session::send_midi_time_code_in_another_thread () void Session::send_time_code_in_another_thread (bool full) { - jack_nframes_t two_smpte_frames_duration; - jack_nframes_t quarter_frame_duration; + nframes_t two_smpte_frames_duration; + nframes_t quarter_frame_duration; /* Duration of two smpte frames */ two_smpte_frames_duration = ((long) _frames_per_smpte_frame) << 1; @@ -775,7 +775,7 @@ Session::send_full_time_code () if (((mtc_smpte_bits >> 5) != MIDI::MTC_25_FPS) && (transmitting_smpte_time.frames % 2)) { // start MTC quarter frame transmission on an even frame SMPTE::increment( transmitting_smpte_time ); - outbound_mtc_smpte_frame += (jack_nframes_t) _frames_per_smpte_frame; + outbound_mtc_smpte_frame += (nframes_t) _frames_per_smpte_frame; } } @@ -817,8 +817,8 @@ Session::send_midi_time_code () return 0; } - jack_nframes_t two_smpte_frames_duration; - jack_nframes_t quarter_frame_duration; + nframes_t two_smpte_frames_duration; + nframes_t quarter_frame_duration; /* Duration of two smpte frames */ two_smpte_frames_duration = ((long) _frames_per_smpte_frame) << 1; @@ -892,7 +892,7 @@ Session::send_midi_time_code () **********************************************************************/ void -Session::send_mmc_in_another_thread (MIDI::MachineControl::Command cmd, jack_nframes_t target_frame) +Session::send_mmc_in_another_thread (MIDI::MachineControl::Command cmd, nframes_t target_frame) { MIDIRequest* request; @@ -910,7 +910,7 @@ Session::send_mmc_in_another_thread (MIDI::MachineControl::Command cmd, jack_nfr } void -Session::deliver_mmc (MIDI::MachineControl::Command cmd, jack_nframes_t where) +Session::deliver_mmc (MIDI::MachineControl::Command cmd, nframes_t where) { using namespace MIDI; int nbytes = 4; |