Tempo rambo - more bbt scale fiddling.

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index bda3f25b3ddb5b523d60bfc4ee0a1befdbb5611b..ea452f9b621fb1247bf3976a04d437789b297e53 100644 (file)
--- 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 ef4cba39214b8db7dc9e55274a0feb78163d0006..370ee4aac1abc9c0dffef907e0c5d90665d29c6d 100644 (file)
--- 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);