diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-03-20 01:03:10 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:11 +1000 |
| commit | f16089ba8860644aeacb237e6ac0055f10d23cb2 (patch) | |
| tree | cfca2e669b2f9192cedf1c71852831a5d61bb30d /gtk2_ardour/editor_tempodisplay.cc | |
| parent | 17a6cda89a40f99e2455abf2c640ad6b8bd1dc29 (diff) | |
Tempo ramps - allow moving the first meter if audio locked.
- strangely broken wrt the grid, but kind-of works.
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 56ee463f9f..3f19665760 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -116,7 +116,6 @@ Editor::tempo_map_changed (const PropertyChange& /*ignored*/) } std::vector<TempoMap::BBTPoint> grid; - compute_current_bbt_points (grid, leftmost_frame, leftmost_frame + current_page_samples()); _session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers draw_measures (grid); @@ -185,12 +184,9 @@ Editor::compute_current_bbt_points (std::vector<TempoMap::BBTPoint>& grid, frame return; } - framecnt_t beat_before_lower_pos = _session->tempo_map().frame_at_beat (floor(_session->tempo_map().beat_at_frame (leftmost))); - framecnt_t beat_after_upper_pos = _session->tempo_map().frame_at_beat (floor (_session->tempo_map().beat_at_frame (rightmost)) + 1.0); - /* prevent negative values of leftmost from creeping into tempomap */ - _session->tempo_map().get_grid (grid, max (beat_before_lower_pos, (framepos_t) 0), beat_after_upper_pos); + _session->tempo_map().get_grid (grid, max (leftmost, (framepos_t) 0), rightmost); } void |