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

tempo map: slight reorganization of ::get_grid

Browse Source 
This avoids resetting beats based on superclocks in case where we
already do the opposite.
This commit is contained in:
Paul Davis 2021-11-17 10:51:23 -07:00
parent 7dbf2445f5
commit 180c1d7759
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/temporal/tempo.cc
View File

@ -1954,7 +1954,11 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t start, superclock_t end, u
if (bar_mod == 0) {
/* Advance by the meter note value size */
/* Advance beats by the meter note value size, and
* then recompute the BBT and superclock
* position corresponding to that musical time
*/
beats += metric.tempo().note_type_as_beats ();
bbt = metric.bbt_at (beats);
start = metric.superclock_at (beats);
@ -2886,8 +2890,8 @@ double
TempoMap::quarters_per_minute_at (timepos_t const & pos) const
{
TempoPoint const & tp (tempo_at (pos));
cerr << "Get gpm using " << tp << " where sc-per-nt at " << pos << " = " << tp.superclocks_per_note_type_at (pos) << endl;
const double val = tp.note_types_per_minute_at_DOUBLE (pos) * (4.0 / tp.note_type());
std::cerr << "qpm @ " << pos << " using " << tp << " = " << val << std::endl;
return val;
}