when calculating average slave/master delta, use absolute value.

[ardour.git] / gtk2_ardour / tempo_lines.cc

diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
index 09c2df1ce99a6e0ed35f6be2bbb76b31fbf7c2e7..8d1d183d3a8a6be6d9b2d33052da97b0e76f360d 100644 (file)
--- a/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@ -29,16 +29,24 @@
 
 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);
 }
 
+TempoLines::~TempoLines ()
+{
+       delete _bfc;
+       _bfc = 0;
+}
+
 void
-TempoLines::tempo_map_changed()
+TempoLines::tempo_map_changed (framepos_t new_origin)
 {
        lines.clear ();
+       _bfc->set_origin_b (new_origin);
 }
 
 void
@@ -72,20 +80,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;
-
-               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 framepos_t f = _bfc->to (Evoral::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) {
                        lines.add (PublicEditor::instance().sample_to_pixel_unrounded (f), 1.0, c);
                }
@@ -103,6 +99,8 @@ TempoLines::draw (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
 
        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;
@@ -165,12 +163,12 @@ TempoLines::draw (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
                                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);