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

somewhat working tempo map cut/copy/paste

Browse Source
This commit is contained in:
Paul Davis 2023-08-30 14:15:48 -06:00
parent 076320430a
commit 7aa1863c0f
2 changed files with 82 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/ardour/session.cc
View File

@ -7304,7 +7304,6 @@ Session::cut_copy_section (timepos_t const& start, timepos_t const& end, timepos
XMLNode &after = _locations->get_state();
add_command (new MementoCommand<Locations> (*_locations, &before, &after));
}
#if 0
TempoMap::WritableSharedPtr wmap = TempoMap::write_copy ();
TempoMapCutBuffer* tmcb;
@ -7314,13 +7313,13 @@ Session::cut_copy_section (timepos_t const& start, timepos_t const& end, timepos
case CopyPasteSection:
if ((tmcb = wmap->copy (start, end))) {
tmcb->dump (std::cerr);
wmap->paste (*tmcb, to, true);
wmap->paste (*tmcb, to, false);
}
break;
case CutPasteSection:
if ((tmcb = wmap->cut (start, end, true))) {
tmcb->dump (std::cerr);
wmap->paste (*tmcb, to, false);
wmap->paste (*tmcb, to, true);
}
break;
default:
@ -7328,18 +7327,17 @@ Session::cut_copy_section (timepos_t const& start, timepos_t const& end, timepos
break;
}
if (tmcb) {
if (tmcb && !tmcb->empty()) {
TempoMap::update (wmap);
delete tmcb;
delete &tm_before;
XMLNode& tm_after (wmap->get_state());
std::cerr << "Saving tmap state as part of rev cmd\n";
add_command (new MementoCommand<TempoMap> (*wmap.get(), &tm_before, &tm_after));
add_command (new TempoCommand (_("cut tempo map"), &tm_before, &tm_after));
} else {
std::cerr << "no tempo map cut buffer\n";
delete &tm_before;
}
#endif
if (!abort_empty_reversible_command ()) {
if (abort_empty_reversible_command ()) {
return;
}

143
libs/temporal/tempo.cc
View File

@ -895,6 +895,7 @@ TempoMap::cut_copy (timepos_t const & start, timepos_t const & end, bool copy, b
mtp = nullptr;
}
dump (std::cerr);
for (Points::iterator p = _points.begin(); p != _points.end(); ) {
@ -922,6 +923,7 @@ TempoMap::cut_copy (timepos_t const & start, timepos_t const & end, bool copy, b
if ((mtp = dynamic_cast<MusicTimePoint const *> (&*p))) {
cb->add (*mtp);
if (!copy && !mtp->sclock() == 0) {
std::cerr << "remove mtp " << *mtp << std::endl;
core_remove_bartime (*mtp);
remove_point (*mtp);
removed = true;
@ -930,6 +932,7 @@ TempoMap::cut_copy (timepos_t const & start, timepos_t const & end, bool copy, b
if ((tp = dynamic_cast<TempoPoint const *> (&*p))) {
cb->add (*tp);
if (!copy && !tp->sclock() == 0) {
std::cerr << "remove tempo " << *tp << std::endl;
core_remove_tempo (*tp);
remove_point (*tp);
removed = true;
@ -937,6 +940,7 @@ TempoMap::cut_copy (timepos_t const & start, timepos_t const & end, bool copy, b
} else if ((mp = dynamic_cast<MeterPoint const *> (&*p))) {
cb->add (*mp);
if (!copy && !mp->sclock() == 0) {
std::cerr << "remove meter " << *mp << std::endl;
core_remove_meter (*mp);
remove_point (*mp);
removed = true;
@ -947,33 +951,21 @@ TempoMap::cut_copy (timepos_t const & start, timepos_t const & end, bool copy, b
p = nxt;
}
dump (std::cerr);
if (!copy && ripple) {
shift (end, start.distance (end));
dump (std::cerr);
}
if (mtp) {
// add_or_replace_bartime (mtp);
}
if (!copy && removed) {
reset_starting_at (start_sclock);
}
if (!copy && ripple) {
}
if (cb->tempos().empty() || cb->tempos().front().sclock() != start.superclocks()) {
cb->add_start_tempo (start_tempo);
}
if (!cb->tempos().empty() && cb->tempos().back().sclock() != start.superclocks()) {
cb->add_end_tempo (end_tempo);
}
if (cb->meters().empty() || cb->meters().front().sclock() != start.superclocks()) {
cb->add_start_meter (start_meter);
}
if (!cb->meters().empty() && cb->meters().back().sclock() != start.superclocks()) {
cb->add_end_meter (end_meter);
}
if (mtp) {
add_or_replace_bartime (mtp);
}
return cb;
}
@ -981,16 +973,22 @@ TempoMap::cut_copy (timepos_t const & start, timepos_t const & end, bool copy, b
void
TempoMap::paste (TempoMapCutBuffer const & cb, timepos_t const & position, bool ripple)
{
std::cerr << "\n\n PASTE \n\n";
if (cb.empty()) {
std::cerr << "nothing to paste\n";
return;
}
dump (std::cerr);
std::cerr << "tm paste, ripple " << ripple << std::endl;
if (ripple) {
shift (position, cb.duration());
}
dump (std::cerr);
bool replaced_ignored;
const timepos_t end_position = position + cb.duration();
@ -1005,48 +1003,63 @@ TempoMap::paste (TempoMapCutBuffer const & cb, timepos_t const & position, bool
BBT_Time pos_bbt = bbt_at (position);
Beats pos_beats = quarters_at (position);
bool ignored;
bool replaced;
Tempo const * st = cb.start_tempo();
Meter const * mt = cb.start_meter();
if (!st && !mt) {
MusicTimePoint* mtp = new MusicTimePoint (*this, position.superclocks(), pos_beats, pos_bbt, tempo_at (position), meter_at (position), _("paste start"));
core_add_bartime (mtp, ignored);
#if 0
MusicTimePoint* mtp = new MusicTimePoint (*this, position.superclocks(), pos_beats, pos_bbt, tempo_at (position), meter_at (position), _("paste start"));
core_add_bartime (mtp, replaced);
if (!replaced) {
core_add_tempo (mtp, ignored);
core_add_meter (mtp, ignored);
core_add_point (mtp);
} else {
if (st) {
TempoPoint *ntp = new TempoPoint (*this, *st, position.superclocks(), pos_beats, pos_bbt);
core_add_tempo (ntp, replaced_ignored);
core_add_point (ntp);
}
if (mt) {
MeterPoint *ntp = new MeterPoint (*this, *mt, position.superclocks(), pos_beats, pos_bbt);
core_add_meter (ntp, replaced_ignored);
core_add_point (ntp);
}
}
#endif
superclock_t s;
for (auto const & p : cb.points()) {
TempoPoint const * tp;
MeterPoint const * mp;
MusicTimePoint const * mtp;
Beats b;
BBT_Time bb;
s = p.sclock() + position.superclocks();
b = quarters_at_superclock (s);
bb = bbt_at (s);
if ((mtp = dynamic_cast<MusicTimePoint const *> (&p))) {
MusicTimePoint *ntp = new MusicTimePoint (*mtp);
ntp->set (ntp->sclock() + position.superclocks(), ntp->beats() + position.beats(), ntp->bbt());
core_add_bartime (ntp, replaced_ignored);
core_add_point (ntp);
tp = dynamic_cast<TempoPoint const *> (&p);
mp = dynamic_cast<MeterPoint const *> (&p);
MusicTimePoint *ntp = new MusicTimePoint (*this, s, b, bb, *tp, *mp, mtp->name());
std::cerr << "Add mtp " << *ntp << std::endl;
core_add_bartime (ntp, replaced);
if (!replaced) {
core_add_tempo (ntp, ignored);
core_add_meter (ntp, ignored);
core_add_point (ntp);
}
} else {
if ((tp = dynamic_cast<TempoPoint const *> (&p))) {
TempoPoint *ntp = new TempoPoint (*tp);
ntp->set (ntp->sclock() + position.superclocks(), ntp->beats() + position.beats(), ntp->bbt());
core_add_tempo (ntp, replaced_ignored);
core_add_point (ntp);
TempoPoint *ntp = new TempoPoint (*this, *tp, s, b, bb);
std::cerr << "Add tempo " << *ntp << std::endl;
core_add_tempo (ntp, replaced);
if (!replaced) {
core_add_point (ntp);
}
} else if ((mp = dynamic_cast<MeterPoint const *> (&p))) {
MeterPoint *ntp = new MeterPoint (*mp);
ntp->set (ntp->sclock() + position.superclocks(), ntp->beats() + position.beats(), ntp->bbt());
core_add_meter (ntp, replaced_ignored);
core_add_point (ntp);
MeterPoint *ntp = new MeterPoint (*this, *mp, s, b, bb);
std::cerr << "Add meter " << *ntp << std::endl;
core_add_meter (ntp, replaced);
if (!replaced) {
core_add_point (ntp);
}
}
}
}
@ -1054,25 +1067,18 @@ TempoMap::paste (TempoMapCutBuffer const & cb, timepos_t const & position, bool
pos_bbt = bbt_at (end_position);
pos_beats = quarters_at (end_position);
st = cb.end_tempo();
mt = cb.end_meter();
if (!st && !mt) {
MusicTimePoint* mtp = new MusicTimePoint (*this, end_position.superclocks(), pos_beats, pos_bbt, end_tempo, end_meter, _("paste end"));
core_add_bartime (mtp, ignored);
#if 0
mtp = new MusicTimePoint (*this, end_position.superclocks(), pos_beats, pos_bbt, end_tempo, end_meter, _("paste end"));
core_add_bartime (mtp, replaced);
if (!replaced) {
core_add_tempo (mtp, ignored);
core_add_meter (mtp, ignored);
core_add_point (mtp);
} else {
if (st) {
TempoPoint *ntp = new TempoPoint (*this, *st, end_position.superclocks(), pos_beats, pos_bbt);
core_add_tempo (ntp, replaced_ignored);
core_add_point (ntp);
}
if (mt) {
MeterPoint *ntp = new MeterPoint (*this, *mt, end_position.superclocks(), pos_beats, pos_bbt);
core_add_meter (ntp, replaced_ignored);
core_add_point (ntp);
}
}
#endif
reset_starting_at (s);
dump (std::cerr);
}
void
@ -1099,8 +1105,6 @@ TempoMap::shift (timepos_t const & at, BBT_Offset const & offset)
{
/* for now we require BBT-based shifts to be in units of whole bars */
std::cerr << "Ripple tempo map by " << offset << std::endl;
if (std::abs (offset.bars) < 1) {
return;
}
@ -1500,6 +1504,7 @@ TempoMap::core_remove_tempo (TempoPoint const & tp)
if (t->sclock() != tp.sclock()) {
/* error ... no tempo point at the time of tp */
std::cerr << "not point at time\n";
return false;
}