From: Ben Loftis Date: Fri, 10 Mar 2017 15:09:30 +0000 (-0600) Subject: Fix likely thinko in bbt ruler. X-Git-Tag: 5.9~642 X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=55e6d3b40d63265d35f7e9be33d7b5b4975a6775 Fix likely thinko in bbt ruler. This fixes a bug for me: Measure lines appear & disappear during playback, at certain zoom scales. I think this is because the unecessary offset was causing beat_density to vary unnecessarily while rolling. --- diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index bdffd6fd39..a32353f9c4 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -1113,7 +1113,7 @@ Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper) bbt_bars = _session->tempo_map().bbt_at_beat (ceil_upper_beat).bars - _session->tempo_map().bbt_at_beat (floor_lower_beat).bars; - beats = (ceil_upper_beat - floor_lower_beat) - bbt_bars; + beats = (ceil_upper_beat - floor_lower_beat);// - bbt_bars; possible thinko; this fixes the problem (for me) where measure lines alternately appear&disappear while playing at certain zoom scales double beat_density = ((beats + 1) * ((double) (upper - lower) / (double) (1 + beat_after_upper_pos - beat_before_lower_pos))) / 5.0; /* Only show the bar helper if there aren't many bars on the screen */