diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-05-27 03:22:24 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:17 +1000 |
| commit | 34c9ac9dd7b1187d9efa2c6894fccba34fe298cd (patch) | |
| tree | a44a03530b47c2a8c63f78180a44e5e2f4ac8e8a /gtk2_ardour/editor_rulers.cc | |
| parent | b564f07635ea917ec574361346ab12d7fa733289 (diff) | |
Tempo ramps - rename bbt_time() -> bbt_at_frame(), frame_time() -> frame_at_bbt()
Diffstat (limited to 'gtk2_ardour/editor_rulers.cc')
| -rw-r--r-- | gtk2_ardour/editor_rulers.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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<ArdourCanvas::Ruler::Mark>& 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<ArdourCanvas::Ruler::Mark>& 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<ArdourCanvas::Ruler::Mark>& 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; } |