From 34c9ac9dd7b1187d9efa2c6894fccba34fe298cd Mon Sep 17 00:00:00 2001 From: nick_m Date: Fri, 27 May 2016 03:22:24 +1000 Subject: Tempo ramps - rename bbt_time() -> bbt_at_frame(), frame_time() -> frame_at_bbt() --- gtk2_ardour/editor_rulers.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gtk2_ardour/editor_rulers.cc') diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index f2b42fccc3..596f4f26b9 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -1275,7 +1275,7 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l next_beat.beats = (*i).beat; next_beat.bars = (*i).bar; next_beat.ticks = tick; - pos = _session->tempo_map().frame_time (next_beat); + pos = _session->tempo_map().frame_at_bbt (next_beat); if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) { i_am_accented = true; @@ -1345,7 +1345,7 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l next_beat.beats = (*i).beat; next_beat.bars = (*i).bar; next_beat.ticks = tick; - pos = _session->tempo_map().frame_time (next_beat); + pos = _session->tempo_map().frame_at_bbt (next_beat); if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) { i_am_accented = true; @@ -1421,7 +1421,7 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l while (tick < Timecode::BBT_Time::ticks_per_beat && (n < bbt_nmarks)) { next_beat.ticks = tick; - pos = _session->tempo_map().frame_time (next_beat); + pos = _session->tempo_map().frame_at_bbt (next_beat); if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) { i_am_accented = true; } -- cgit v1.2.3