correctly package color theme files for both linux and OS X

[ardour.git] / gtk2_ardour / tempo_lines.cc

diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
index 7a5be311ed9c1709e321a225d096b8b026754b91..630e476adf82c263d68baae20a19c80edb16890d 100644 (file)
--- a/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@ -69,22 +69,23 @@ TempoLines::draw_ticks (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
                                level = d;
                        }
                }
-
                /* 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 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);
+                       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;
+
+                       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_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);
                }
@@ -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);
                }
        }
 }