ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Tempo rambo - more bbt scale fiddling.

This commit is contained in:
nick_m 2016-03-28 06:05:20 +11:00
parent 15f8f371c3
commit 58f01bb3f7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/editor_rulers.cc
View File

@ -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;

2
gtk2_ardour/tempo_lines.cc
View File

@ -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);