allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

use simpler logic to avoid negative values when filling grid

Browse Source
This commit is contained in:
Paul Davis
2021-03-22 16:02:36 -06:00
parent 88bed837c0
commit 2ec93062d9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/editor_tempodisplay.cc
View File

@@ -254,11 +254,14 @@ Editor::compute_current_bbt_points (Temporal::TempoMapPoints& grid, samplepos_t
return;
}
TempoMap::SharedPtr tmap (TempoMap::use());
/* prevent negative values of leftmost from creeping into tempomap
*/
const Beats lower_beat = max (Beats (), TempoMap::use()->quarters_at_sample (leftmost)).round_down_to_beat() - Beats (1, 0);
const Beats left = tmap->quarters_at_sample (leftmost).round_down_to_beat();
const Beats lower_beat = (left < Beats() ? Beats() : left);
const samplecnt_t sr (_session->sample_rate());
TempoMap::SharedPtr tmap (TempoMap::use());
switch (bbt_ruler_scale) {
@@ -487,6 +490,7 @@ Editor::edit_tempo_section (TempoPoint& section)
begin_reversible_command (_("replace tempo mark"));
XMLNode &before = tmap->get_state();
tmap->set_tempo (tempo, when);
XMLNode &after = tmap->get_state();