diff options
| author | Robin Gareus <robin@gareus.org> | 2012-11-18 00:29:50 +0000 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2012-11-18 00:29:50 +0000 |
| commit | 1624f1d7143a01859c2138d8f0a966b8d5384dd7 (patch) | |
| tree | 56bf5a467081298b474d865962c6bcd0430b135c | |
| parent | fe11de43816e19407c5f9d7a9bfafe3c546923b8 (diff) | |
fix LTC frame offset for video standards
git-svn-id: svn://localhost/ardour2/branches/3.0@13517 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/ltc_slave.cc | 8 | ||||
| -rw-r--r-- | libs/ardour/session_ltc.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc index d47f2e3672..5d3ee83139 100644 --- a/libs/ardour/ltc_slave.cc +++ b/libs/ardour/ltc_slave.cc @@ -359,13 +359,13 @@ LTC_Slave::process_ltc(framepos_t const now) ltc_frame_increment(&frame.ltc, fps_i, tv_standard, 0); ltc_frame_to_time(&stime, &frame.ltc, 0); transport_direction = 1; - frame.off_start += ltc_frame_alignment(session.frame_rate(), tv_standard); - frame.off_end += ltc_frame_alignment(session.frame_rate(), tv_standard); + frame.off_start += ltc_frame_alignment(session.frames_per_timecode_frame(), tv_standard); + frame.off_end += ltc_frame_alignment(session.frames_per_timecode_frame(), tv_standard); } else { ltc_frame_decrement(&frame.ltc, fps_i, tv_standard, 0); int off = frame.off_end - frame.off_start; - frame.off_start += off + ltc_frame_alignment(session.frame_rate(), tv_standard); - frame.off_end += off + ltc_frame_alignment(session.frame_rate(), tv_standard); + frame.off_start += off + ltc_frame_alignment(session.frames_per_timecode_frame(), tv_standard); + frame.off_end += off + ltc_frame_alignment(session.frames_per_timecode_frame(), tv_standard); transport_direction = -1; } diff --git a/libs/ardour/session_ltc.cc b/libs/ardour/session_ltc.cc index 93368d6e61..d30e157a1b 100644 --- a/libs/ardour/session_ltc.cc +++ b/libs/ardour/session_ltc.cc @@ -246,7 +246,7 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end framepos_t cycle_start_frame = (current_speed < 0) ? (start_frame - ltc_out_latency.max) : (start_frame + ltc_out_latency.max); /* LTC TV standard offset */ - cycle_start_frame += ltc_frame_alignment(nominal_frame_rate(), TV_STANDARD(cur_timecode)); + cycle_start_frame += ltc_frame_alignment(frames_per_timecode_frame(), TV_STANDARD(cur_timecode)); /* cycle-start may become negative due to latency compensation */ if (cycle_start_frame < 0) { cycle_start_frame = 0; } |