From: nick_m <mainsbridge@gmail.com>
Date: Sun, 27 Mar 2016 19:05:20 +0000 (+1100)
Subject: Tempo rambo - more bbt scale fiddling.
X-Git-Tag: 5.0-pre0~474
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=58f01bb3f797f737ca8994c0f00ff1c5905efcb5;p=ardour.git

Tempo rambo - more bbt scale fiddling.
---

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index bda3f25b3d..ea452f9b62 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -1126,11 +1126,11 @@ Editor::compute_bbt_ruler_scale (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
 		bbt_ruler_scale = bbt_show_many;
 	} else if (beat_density > 1024) {
 		bbt_ruler_scale = bbt_show_64;
-	} else if (beat_density > 500) {
+	} else if (beat_density > 512) {
 		bbt_ruler_scale = bbt_show_16;
-	} else if (beat_density > 100) {
+	} else if (beat_density > 128) {
 		bbt_ruler_scale = bbt_show_4;
-	} else if (beat_density > 10) {
+	} else if (beat_density > 16) {
 		bbt_ruler_scale =  bbt_show_1;
 	} else if (beat_density > 2) {
 		bbt_ruler_scale =  bbt_show_beats;
diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
index ef4cba3921..370ee4aac1 100644
--- a/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@ -77,7 +77,7 @@ TempoLines::draw_ticks (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
 		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()) / divisions;
+			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);