jonah/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-02-06 21:36:11 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

temporal: after pasting into a tempo map, the terminal BBT marker (if any) should be at least 1 beat after the last point

Browse Source
This commit is contained in:
Paul Davis
2026-02-05 18:06:19 -07:00
parent 88182392c3
commit d16a029492
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/temporal/tempo.cc
View File

@@ -1126,7 +1126,6 @@ TempoMap::paste (TempoMapCutBuffer const & cb, timepos_t const & position, bool
shift (position, cb.duration());
}
/* We need to look these up first, before we change the map */
const timepos_t end_position = position + cb.duration();
const Tempo end_tempo = tempo_at (end_position);
@@ -1218,18 +1217,22 @@ TempoMap::paste (TempoMapCutBuffer const & cb, timepos_t const & position, bool
reset_starting_at (s);
}
pos_bbt = bbt_at (end_position);
pos_beats = quarters_at (end_position);
pos_beats += Beats (1, 0);
timepos_t ep (timepos_t::from_superclock (superclock_at (pos_beats)));
pos_bbt = bbt_at (ep);
if (pos_bbt.ticks != 0 || pos_bbt.beats != 1) {
/* Not on first beat of a beat */
if (suggested_name.empty()) {
name = _("<paste");
} else {
name = string_compose (X_("<%1"), suggested_name);
}
mtp = new MusicTimePoint (*this, end_position.superclocks(), pos_beats, pos_bbt, end_tempo, end_meter, name);
mtp = new MusicTimePoint (*this, ep.superclocks(), pos_beats, pos_bbt, end_tempo, end_meter, name);
core_add_bartime (mtp, replaced);
if (!replaced) {
core_add_tempo (mtp, ignored);