X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_lines.cc;h=630e476adf82c263d68baae20a19c80edb16890d;hb=19b82b8a8301e80d98d86cc96fa53214f55689db;hp=c32048610852970a6c3e0a7b3396b8c72de7937e;hpb=7fc3b0c34c552d7be862897bd0aaa542453e9973;p=ardour.git

diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
index c320486108..630e476adf 100644
--- a/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@ -59,7 +59,6 @@ TempoLines::draw_ticks (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
                         framecnt_t                                            leftmost_frame,
                         framecnt_t                                            frame_rate)
 {
-	const double   fpb  = grid.begin()->tempo->frames_per_beat(frame_rate);
 	const uint32_t base = UIConfiguration::instance().color_mod("measure line beat", "measure line beat");
 
 	for (unsigned l = 1; l < divisions; ++l) {
@@ -70,12 +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);
-		const framepos_t f = grid.begin()->frame + (l * (fpb / (double)divisions));
-		//const framepos_t f = frame_at_tick (last_beat_in_ticks + (l * (BBT_Time::ticks_per_beat / (double)divisions)));
+		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;
+
+			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);
 		}
@@ -142,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);
 		}
 	}
 }