smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

temporal: fix TempoMap::paste() to pass unit test

Browse source 
the BBT times of the newly inserted points during paste() are meaningless until
we recompute them using ::reset_starting_at(). So don't try to compute some
sort of likely value, just use the value from the cut buffer, and call
reset_starting_at() after every point inserted.
This commit is contained in:
Paul Davis 2025-08-19 10:46:37 -06:00
parent ee6356d9df
commit 2aad1ac5f5
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libs/temporal/tempo.cc
View file

@ -1096,10 +1096,11 @@ TempoMap::paste (TempoMapCutBuffer const & cb, timepos_t const & position, bool
core_add_meter (mtp, ignored);
core_add_point (mtp);
}
reset_starting_at (position.superclocks());
}
MeterPoint const * current_meter = &meter_at (position);
BBT_Offset bbt_offset = BBT_Offset (cb.points().front().bbt()) - BBT_Offset (pos_bbt);
for (auto const & p : cb.points()) {
TempoPoint const * tp;
@ -1134,21 +1135,21 @@ TempoMap::paste (TempoMapCutBuffer const & cb, timepos_t const & position, bool
} else {
if ((tp = dynamic_cast<TempoPoint const *> (&p))) {
bb = current_meter->bbt_add (p.bbt(), bbt_offset);
TempoPoint *ntp = new TempoPoint (*this, *tp, s, b, bb);
TempoPoint *ntp = new TempoPoint (*this, *tp, s, b, p.bbt());
core_add_tempo (ntp, replaced);
if (!replaced) {
core_add_point (ntp);
}
} else if ((mp = dynamic_cast<MeterPoint const *> (&p))) {
bb = current_meter->bbt_add (p.bbt(), bbt_offset);
MeterPoint *ntp = new MeterPoint (*this, *mp, s, b, bb);
MeterPoint *ntp = new MeterPoint (*this, *mp, s, b, p.bbt());
current_meter = core_add_meter (ntp, replaced);
if (!replaced) {
core_add_point (ntp);
}
}
}
reset_starting_at (s);
}
pos_bbt = bbt_at (end_position);
@ -1169,9 +1170,9 @@ TempoMap::paste (TempoMapCutBuffer const & cb, timepos_t const & position, bool
core_add_meter (mtp, ignored);
core_add_point (mtp);
}
}
reset_starting_at (s);
reset_starting_at (s);
}
}
void