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.beats_per_minute()) + 1) / grid.begin()->c;
+ 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_beat (frame_rate)
+ 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));
uint32_t beats = 0;
uint32_t bars = 0;
+ const uint32_t bar_color = UIConfiguration::instance().color ("measure line bar");
+ const uint32_t beat_color = UIConfiguration::instance().color_mod ("measure line beat", "measure line beat");
uint32_t color;
bool all_bars = false;
continue;
}
- color = UIConfiguration::instance().color ("measure line bar");
+ color = bar_color;
} else {
if (beat_density > 0.3) {
continue; /* only draw beat lines if the gaps between beats are large. */
}
- color = UIConfiguration::instance().color_mod ("measure line beat", "measure line beat");
+ color = beat_color;
}
ArdourCanvas::Coord xpos = PublicEditor::instance().sample_to_pixel_unrounded ((*i).frame);