smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

Editor::trim_region_front/end should obey ripple mode

Browse source
This commit is contained in:
Paul Davis 2025-07-09 17:02:11 -06:00
parent 74a0272c50
commit 2def30bda5
1 changed files with 60 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

70
gtk2_ardour/editor_ops.cc
View file

@ -3753,22 +3753,72 @@ Editor::trim_region (bool front)
begin_reversible_command (front ? _("trim front") : _("trim back")); begin_reversible_command (front ? _("trim front") : _("trim back"));
for (list<RegionView*>::const_iterator i = rs.by_layer().begin(); i != rs.by_layer().end(); ++i) { list<RegionView*> rsl (rs.by_layer());
if (!(*i)->region()->locked()) { vector<std::shared_ptr<Playlist> > playlists;
(*i)->region()->clear_changes (); for (auto & rv : rsl) {
if (front) { std::shared_ptr<Region> region (rv->region());
(*i)->region()->trim_front (where);
} else {
(*i)->region()->trim_end (where);
}
_session->add_command (new StatefulDiffCommand ((*i)->region())); if (region->locked()) {
continue;
} }
std::shared_ptr<Playlist> playlist = region->playlist();
if (!playlist) {
// is this check necessary?
continue;
}
if (std::find (playlists.begin(), playlists.end(), playlist) == playlists.end()) {
playlists.push_back (playlist);
playlist->clear_changes ();
playlist->clear_owned_changes ();
playlist->freeze ();
}
region->clear_changes ();
timepos_t old_pos = region->position();
timecnt_t delta;
if (front) {
delta = where.distance (region->position());
region->trim_front (where);
} else {
delta = region->end().distance (where);
region->trim_end (where);
}
if (should_ripple()) {
do_ripple (playlist, old_pos, delta, std::shared_ptr<Region>(), false);
}
add_command (new StatefulDiffCommand (region));
} }
commit_reversible_command (); bool commit_result = false;
for (auto & pl : playlists) {
commit_result = true;
pl->thaw ();
/* We might have removed regions, which alters other regions' layering_index,
so we need to do a recursive diff here.
*/
vector<Command*> cmds;
pl->rdiff (cmds);
add_commands (cmds);
add_command (new StatefulDiffCommand (pl));
}
if (commit_result) {
commit_reversible_command ();
} else {
abort_reversible_command ();
}
} }
/** Trim the end of the selected regions to the position of the edit cursor */ /** Trim the end of the selected regions to the position of the edit cursor */