diff options
author | nick_m <mainsbridge@gmail.com> | 2017-06-09 01:44:48 +1000 |
---|---|---|
committer | nick_m <mainsbridge@gmail.com> | 2017-06-09 01:44:48 +1000 |
commit | cebefe69d9456ab57fc61128a7931baccef899bc (patch) | |
tree | 866e325ee7a0a7d8a1d89eb6aca5d547664a1366 /gtk2_ardour/tempo_lines.cc | |
parent | 2b320d51dd080909a0e305116f1396dd1356200b (diff) |
Tempo lines display subdivisions correctly over a tempo change
TempoMap::get_grid() supplies a list of beat positions, leaving the lines
to work out any subdivision positions.
This is fine, unless a tempo section falls in between beats.
Use a BeatsFramesConverter along with a quarter note position
(in the BBTPointsList) to make this easier.
Diffstat (limited to 'gtk2_ardour/tempo_lines.cc')
-rw-r--r-- | gtk2_ardour/tempo_lines.cc | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc index 7a780c424e..ff7b8ad529 100644 --- a/gtk2_ardour/tempo_lines.cc +++ b/gtk2_ardour/tempo_lines.cc @@ -29,8 +29,9 @@ using namespace std; -TempoLines::TempoLines (ArdourCanvas::Container* group, double) +TempoLines::TempoLines (ArdourCanvas::Container* group, double, ARDOUR::BeatsFramesConverter* bfc) : lines (group, ArdourCanvas::LineSet::Vertical) + , _bfc (bfc) { lines.set_extent (ArdourCanvas::COORD_MAX); } @@ -72,20 +73,8 @@ TempoLines::draw_ticks (std::vector<ARDOUR::TempoMap::BBTPoint>& grid, /* draw line with alpha corresponding to coarsest level */ const uint8_t a = max(8, (int)rint(UINT_RGBA_A(base) / (0.8 * log2(level)))); const uint32_t c = UINT_RGBA_CHANGE_A(base, a); - framepos_t f = 0; + const framepos_t f = _bfc->to (Evoral::Beats (grid.begin()->qn + (l / (double) divisions))); - if (grid.begin()->c != 0.0) { - const double beat_divisions = (l / ((double) divisions)) * (grid.begin()->tempo.note_type() / grid.begin()->meter.note_divisor()); - const double time_at_division = log (((grid.begin()->c * (beat_divisions)) / - grid.begin()->tempo.note_types_per_minute()) + 1) / grid.begin()->c; - - f = grid.begin()->frame + (framecnt_t) floor ((time_at_division * 60.0 * frame_rate) + 0.5); - } else { - const double fpb = grid.begin()->tempo.frames_per_note_type (frame_rate) - * (grid.begin()->tempo.note_type() / grid.begin()->meter.note_divisor()); - - f = grid.begin()->frame + (l * (fpb / (double) divisions)); - } if (f > leftmost_frame) { lines.add (PublicEditor::instance().sample_to_pixel_unrounded (f), 1.0, c); } |