diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-03 18:43:58 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-03 18:43:58 +0000 |
| commit | 2a200bdc0ead3d2a2a0481db44b0bc080529aa69 (patch) | |
| tree | 2dc854572ed60513668647c2416707c89c68c3ea /gtk2_ardour/editor_tempodisplay.cc | |
| parent | 0d4658e0afb35329fe4ba135a20df92691f8b639 (diff) | |
return two iterators into the Bars|Beats list of the tempo map rather than making a copy; use iterators in the GUI
git-svn-id: svn://localhost/ardour2/branches/3.0@11146 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 79f5caf82b..25fb5acbe7 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -169,8 +169,7 @@ Editor::compute_current_bbt_points (framepos_t leftmost, framepos_t rightmost) } next_beat.ticks = 0; - current_bbt_points.clear(); - _session->tempo_map().map (current_bbt_points, _session->tempo_map().frame_time (previous_beat), _session->tempo_map().frame_time (next_beat) + 1); + _session->tempo_map().map (current_bbt_points_begin, current_bbt_points_end, _session->tempo_map().frame_time (previous_beat), _session->tempo_map().frame_time (next_beat) + 1); } void @@ -190,7 +189,7 @@ Editor::redraw_measures () void Editor::draw_measures () { - if (_session == 0 || _show_measures == false || current_bbt_points.empty()) { + if (_session == 0 || _show_measures == false || distance (current_bbt_points_begin, current_bbt_points_end) == 0) { return; } @@ -198,7 +197,7 @@ Editor::draw_measures () tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height(get_window())); } - tempo_lines->draw (current_bbt_points, frames_per_unit); + tempo_lines->draw (current_bbt_points_begin, current_bbt_points_end, frames_per_unit); } void |