diff options
| author | David Robillard <d@drobilla.net> | 2006-06-15 21:54:26 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-06-15 21:54:26 +0000 |
| commit | 6313751f753c4e85116b0fcdaaf21e4d8369b4af (patch) | |
| tree | fde36406fa61cc45c18571e6e062a7d23e5f4819 /libs/ardour/session_midi.cc | |
| parent | 4ef0bd23109d0a05a46f71e90676a58642dfabc5 (diff) | |
Moved SMPTE type/functions into SMPTE namespace;
LGPL'd SMPTE code and moved in to libardour_cp;
Juggled control_protocol dir layout to be the same as other libs;
git-svn-id: svn://localhost/ardour2/trunk@610 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_midi.cc')
| -rw-r--r-- | libs/ardour/session_midi.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index fa9fa4a2a3..1fb5658761 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -724,7 +724,7 @@ Session::mmc_locate (MIDI::MachineControl &mmc, const MIDI::byte* mmc_tc) } jack_nframes_t target_frame; - SMPTE_Time smpte; + SMPTE::Time smpte; smpte.hours = mmc_tc[0] & 0xf; smpte.minutes = mmc_tc[1]; @@ -858,7 +858,7 @@ Session::send_full_time_code () { MIDI::byte msg[10]; - SMPTE_Time smpte; + SMPTE::Time smpte; if (_mtc_port == 0 || !send_mtc) { return 0; @@ -884,7 +884,7 @@ Session::send_full_time_code () outbound_mtc_smpte_frame = _transport_frame; 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 ); + SMPTE::increment( transmitting_smpte_time ); outbound_mtc_smpte_frame += (jack_nframes_t) _frames_per_smpte_frame; } } @@ -985,8 +985,8 @@ Session::send_midi_time_code () // Wrap quarter frame counter next_quarter_frame_to_send = 0; // Increment smpte time twice - smpte_increment( transmitting_smpte_time ); - smpte_increment( transmitting_smpte_time ); + SMPTE::increment( transmitting_smpte_time ); + SMPTE::increment( transmitting_smpte_time ); // Re-calculate timing of first quarter frame smpte_to_sample( transmitting_smpte_time, outbound_mtc_smpte_frame, true /* use_offset */, false ); // Compensate for audio latency @@ -1024,7 +1024,7 @@ Session::deliver_mmc (MIDI::MachineControl::Command cmd, jack_nframes_t where) { using namespace MIDI; int nbytes = 4; - SMPTE_Time smpte; + SMPTE::Time smpte; if (_mmc_port == 0 || !send_mmc) { return; |