13
0

Merge branch 'ardour'

This commit is contained in:
Robin Gareus 2024-05-14 03:48:30 +02:00
commit 662c47651a
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 2 additions and 1 deletions

View File

@ -2668,6 +2668,7 @@ Playlist::relayer ()
} }
assert (divisions == 0 || end_division < divisions); assert (divisions == 0 || end_division < divisions);
assert (start_division >= 0 && end_division >= start_division);
/* find the lowest layer that this region can go on */ /* find the lowest layer that this region can go on */
size_t j = layers.size (); size_t j = layers.size ();

View File

@ -3619,7 +3619,7 @@ TempoMap::remove_time (timepos_t const & pos, timecnt_t const & duration)
} }
if (last_meter && !meter_after) { if (last_meter && !meter_after) {
last_tempo->set (start, last_meter->beats(), last_meter->bbt()); last_meter->set (start, last_meter->beats(), last_meter->bbt());
moved = true; moved = true;
} }