using namespace std;
-TempoLines::TempoLines (ArdourCanvas::Container* group, double)
+TempoLines::TempoLines (ArdourCanvas::Container* group, double, ARDOUR::BeatsSamplesConverter* bfc)
: lines (group, ArdourCanvas::LineSet::Vertical)
+ , _bfc (bfc)
{
lines.set_extent (ArdourCanvas::COORD_MAX);
}
+TempoLines::~TempoLines ()
+{
+ delete _bfc;
+ _bfc = 0;
+}
+
void
-TempoLines::tempo_map_changed()
+TempoLines::tempo_map_changed (samplepos_t new_origin)
{
lines.clear ();
+ _bfc->set_origin_b (new_origin);
}
void
void
TempoLines::draw_ticks (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
unsigned divisions,
- framecnt_t leftmost_frame,
- framecnt_t frame_rate)
+ samplecnt_t leftmost_sample,
+ samplecnt_t sample_rate)
{
const uint32_t base = UIConfiguration::instance().color_mod("measure line beat", "measure line beat");
/* 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;
-
- 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;
+ const samplepos_t f = _bfc->to (Temporal::Beats (grid.begin()->qn + (l / (double) divisions))) + _bfc->origin_b();
- 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)
- * (grid.begin()->tempo.note_type() / grid.begin()->meter.note_divisor());
-
- f = grid.begin()->frame + (l * (fpb / (double) divisions));
- }
- if (f > leftmost_frame) {
+ if (f > leftmost_sample) {
lines.add (PublicEditor::instance().sample_to_pixel_unrounded (f), 1.0, c);
}
}
void
TempoLines::draw (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
unsigned divisions,
- framecnt_t leftmost_frame,
- framecnt_t frame_rate)
+ samplecnt_t leftmost_sample,
+ samplecnt_t sample_rate)
{
std::vector<ARDOUR::TempoMap::BBTPoint>::const_iterator i;
double beat_density;
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;
}
double canvas_width_used = 1.0;
- if (leftmost_frame < grid.front().frame) {
- const framecnt_t frame_distance = max ((framecnt_t) 1, grid.back().frame - grid.front().frame);
- canvas_width_used = 1.0 - ((grid.front().frame - leftmost_frame) / (double) (frame_distance + grid.front().frame));
+ if (leftmost_sample < grid.front().sample) {
+ const samplecnt_t sample_distance = max ((samplecnt_t) 1, grid.back().sample - grid.front().sample);
+ canvas_width_used = 1.0 - ((grid.front().sample - leftmost_sample) / (double) (sample_distance + grid.front().sample));
}
beat_density = (beats * 10.0f) / (lines.canvas()->width() * canvas_width_used);
}
lines.clear ();
- if (beat_density <= 0.12 && grid.begin() != grid.end() && grid.begin()->frame > 0 && !all_bars) {
+ if (beat_density <= 0.12 && grid.begin() != grid.end() && grid.begin()->sample > 0 && !all_bars) {
/* draw subdivisions of the beat before the first visible beat line XX this shouldn't happen now */
std::vector<ARDOUR::TempoMap::BBTPoint> vec;
vec.push_back (*i);
- draw_ticks (vec, divisions, leftmost_frame, frame_rate);
+ draw_ticks (vec, divisions, leftmost_sample, sample_rate);
}
for (i = grid.begin(); i != grid.end(); ++i) {
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);
+ ArdourCanvas::Coord xpos = PublicEditor::instance().sample_to_pixel_unrounded ((*i).sample);
lines.add (xpos, 1.0, color);
/* draw subdivisions of this beat */
std::vector<ARDOUR::TempoMap::BBTPoint> vec;
vec.push_back (*i);
- draw_ticks (vec, divisions, leftmost_frame, frame_rate);
+ draw_ticks (vec, divisions, leftmost_sample, sample_rate);
}
}
}