diff options
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor.cc | 12 | ||||
| -rw-r--r-- | gtk2_ardour/editor_rulers.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/option_editor.cc | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index ea71b5ba0d..c7ad5b49c5 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2731,18 +2731,18 @@ Editor::snap_to (framepos_t& start, RoundMode direction, bool for_mark, bool ens void Editor::timecode_snap_to_internal (framepos_t& start, RoundMode direction, bool /*for_mark*/) { - const framepos_t one_timecode_second = (framepos_t)(rint(_session->timecode_frames_per_second()) * _session->frames_per_timecode_frame()); - framepos_t one_timecode_minute = (framepos_t)(rint(_session->timecode_frames_per_second()) * _session->frames_per_timecode_frame() * 60); + const framepos_t one_timecode_second = (framepos_t)(rint(_session->timecode_frames_per_second()) * _session->samples_per_timecode_frame()); + framepos_t one_timecode_minute = (framepos_t)(rint(_session->timecode_frames_per_second()) * _session->samples_per_timecode_frame() * 60); switch (_snap_type) { case SnapToTimecodeFrame: if ((direction == RoundUpMaybe || direction == RoundDownMaybe) && - fmod((double)start, (double)_session->frames_per_timecode_frame()) == 0) { + fmod((double)start, (double)_session->samples_per_timecode_frame()) == 0) { /* start is already on a whole timecode frame, do nothing */ - } else if (((direction == 0) && (fmod((double)start, (double)_session->frames_per_timecode_frame()) > (_session->frames_per_timecode_frame() / 2))) || (direction > 0)) { - start = (framepos_t) (ceil ((double) start / _session->frames_per_timecode_frame()) * _session->frames_per_timecode_frame()); + } else if (((direction == 0) && (fmod((double)start, (double)_session->samples_per_timecode_frame()) > (_session->samples_per_timecode_frame() / 2))) || (direction > 0)) { + start = (framepos_t) (ceil ((double) start / _session->samples_per_timecode_frame()) * _session->samples_per_timecode_frame()); } else { - start = (framepos_t) (floor ((double) start / _session->frames_per_timecode_frame()) * _session->frames_per_timecode_frame()); + start = (framepos_t) (floor ((double) start / _session->samples_per_timecode_frame()) * _session->samples_per_timecode_frame()); } break; diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 4424546296..bdffd6fd39 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -747,26 +747,26 @@ Editor::set_timecode_ruler_scale (framepos_t lower, framepos_t upper) upper = upper + spacer; framecnt_t const range = upper - lower; - if (range < (2 * _session->frames_per_timecode_frame())) { /* 0 - 2 frames */ + if (range < (2 * _session->samples_per_timecode_frame())) { /* 0 - 2 frames */ timecode_ruler_scale = timecode_show_bits; timecode_mark_modulo = 20; timecode_nmarks = 2 + (2 * _session->config.get_subframes_per_frame()); } else if (range <= (fr / 4)) { /* 2 frames - 0.250 second */ timecode_ruler_scale = timecode_show_frames; timecode_mark_modulo = 1; - timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame()); + timecode_nmarks = 2 + (range / (framepos_t)_session->samples_per_timecode_frame()); } else if (range <= (fr / 2)) { /* 0.25-0.5 second */ timecode_ruler_scale = timecode_show_frames; timecode_mark_modulo = 2; - timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame()); + timecode_nmarks = 2 + (range / (framepos_t)_session->samples_per_timecode_frame()); } else if (range <= fr) { /* 0.5-1 second */ timecode_ruler_scale = timecode_show_frames; timecode_mark_modulo = 5; - timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame()); + timecode_nmarks = 2 + (range / (framepos_t)_session->samples_per_timecode_frame()); } else if (range <= 2 * fr) { /* 1-2 seconds */ timecode_ruler_scale = timecode_show_frames; timecode_mark_modulo = 10; - timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame()); + timecode_nmarks = 2 + (range / (framepos_t)_session->samples_per_timecode_frame()); } else if (range <= 8 * fr) { /* 2-8 seconds */ timecode_ruler_scale = timecode_show_seconds; timecode_mark_modulo = 1; diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index 995f12ab48..64c867970e 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -428,7 +428,7 @@ ClockOption::set_state_from_config () if (!Timecode::parse_timecode_format(_get(), TC)) { _clock.set (0, true); } - TC.rate = _session->frames_per_timecode_frame(); + TC.rate = _session->samples_per_timecode_frame(); TC.drop = _session->timecode_drop_frames(); _session->timecode_to_sample(TC, when, false, false); if (TC.negative) { when=-when; } |