diff options
| author | nick_m <mainsbridge@gmail.com> | 2017-06-09 11:05:56 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2017-06-09 11:05:56 +1000 |
| commit | b4ddbce1ff6701aec8d83a970637f3f2e1693098 (patch) | |
| tree | 6ff877ee6b870de89e14ec48c100c6efe6f1e752 /gtk2_ardour/editor_tempodisplay.cc | |
| parent | 4ef4f45f3d8812bf6f9b45e06e77e844ce0ce536 (diff) | |
Fix incorrect positioning of tempo line subdivisions if first meter is non-zero
Commit cebefe6 assumed that frame 0 was the music origin.
Silly me.
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index b11bee44d3..34a80dfc93 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -181,7 +181,7 @@ Editor::tempo_map_changed (const PropertyChange& /*ignored*/) ENSURE_GUI_THREAD (*this, &Editor::tempo_map_changed, ignored); if (tempo_lines) { - tempo_lines->tempo_map_changed(); + tempo_lines->tempo_map_changed(_session->tempo_map().music_origin()); } compute_bbt_ruler_scale (leftmost_frame, leftmost_frame + current_page_samples()); @@ -204,7 +204,7 @@ Editor::tempometric_position_changed (const PropertyChange& /*ignored*/) ENSURE_GUI_THREAD (*this, &Editor::tempo_map_changed); if (tempo_lines) { - tempo_lines->tempo_map_changed(); + tempo_lines->tempo_map_changed(_session->tempo_map().music_origin()); } TempoSection* prev_ts = 0; @@ -394,7 +394,7 @@ Editor::draw_measures (std::vector<ARDOUR::TempoMap::BBTPoint>& grid) } if (tempo_lines == 0) { - tempo_lines = new TempoLines (time_line_group, ArdourCanvas::LineSet::Vertical, new BeatsFramesConverter (_session->tempo_map(), 0)); + tempo_lines = new TempoLines (time_line_group, ArdourCanvas::LineSet::Vertical, new BeatsFramesConverter (_session->tempo_map(), _session->tempo_map().music_origin())); } const unsigned divisions = get_grid_beat_divisions(leftmost_frame); |