From 76e5aaea44af4d7b2be3dee9cb78dfbf8cc4db6d Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 19 Mar 2021 14:17:49 -0600 Subject: [PATCH] remove another NUTEMPO #warning by using TempoMap::count_bars() --- gtk2_ardour/editor_rulers.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 27edc9dfdb..0f8fc91cf0 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -1005,8 +1005,7 @@ Editor::compute_bbt_ruler_scale (samplepos_t lower, samplepos_t upper) return; } -#warning NUTEMPO implement a count of bars between two positions (taking position markers into account) - bbt_bars = tmap->bbt_at (ceil_upper_beat).bars - tmap->bbt_at (floor_lower_beat).bars; + bbt_bars = tmap->count_bars (floor_lower_beat, ceil_upper_beat); double ruler_line_granularity = UIConfiguration::instance().get_ruler_granularity (); //in pixels ruler_line_granularity = _visible_canvas_width / (ruler_line_granularity*5); //fudge factor '5' probably related to (4+1 beats)/measure, I think