diff options
| author | Robin Gareus <robin@gareus.org> | 2016-12-08 12:26:41 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-12-08 12:45:44 +0100 |
| commit | 61c7af141d339187d229d28a09940e25b2e144f8 (patch) | |
| tree | b0eadbe84252513f785f36ea1ffff0c2783a8745 /gtk2_ardour/editor_rulers.cc | |
| parent | f05f19bdd4c376d8427f488ab9c812df4d400fbc (diff) | |
Clarify "frames" (video, timecode) vs "samples" (audio)
Diffstat (limited to 'gtk2_ardour/editor_rulers.cc')
| -rw-r--r-- | gtk2_ardour/editor_rulers.cc | 10 |
1 files changed, 5 insertions, 5 deletions
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; |