summaryrefslogtreecommitdiff
path: root/gtk2_ardour/tempo_lines.cc
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-04-15 02:19:30 +1000
committernick_m <mainsbridge@gmail.com>2016-05-27 23:38:15 +1000
commit71a90399fe8561310b848fbfb8d28a65a395a6c1 (patch)
treef617e7c64d08ba0839001c7894bac3f30bcf0e3d /gtk2_ardour/tempo_lines.cc
parent105999956e8a4b2fc344e5665e1c06801256c126 (diff)
Tempo ramps - fix BBTPoint wtf.
- tempo tick lines should draw properly now.
Diffstat (limited to 'gtk2_ardour/tempo_lines.cc')
-rw-r--r--gtk2_ardour/tempo_lines.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
index 7a5be311ed..6bc0e435c5 100644
--- a/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@ -76,7 +76,7 @@ TempoLines::draw_ticks (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
framepos_t f = 0;
if (grid.begin()->c != 0.0) {
- const double pulses_per_div = l * (grid.begin()->tempo.note_type() / grid.begin()->meter->note_divisor()) / (double) divisions;
+ const double pulses_per_div = l * (grid.begin()->tempo.note_type() / grid.begin()->meter.note_divisor()) / (double) divisions;
const double time_at_pulse = log (((grid.begin()->c * (pulses_per_div / grid.begin()->tempo.note_type())) /
grid.begin()->tempo.pulses_per_minute()) + 1) / grid.begin()->c;
f = grid.begin()->frame + (framecnt_t) floor ((time_at_pulse * 60.0 * frame_rate) + 0.5);
@@ -86,6 +86,7 @@ TempoLines::draw_ticks (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
}
if (f > leftmost_frame) {
+
lines.add (PublicEditor::instance().sample_to_pixel_unrounded (f), 1.0, c);
}
}
@@ -151,8 +152,7 @@ TempoLines::draw (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
/* 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_frame, frame_rate);
}
}
}