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

Fix "Crop Region to Range".

Browse Source 
Before only regions that contained the start of the range were cropped,
now all are cropped.
This commit is contained in:
André Nusser 2015-11-26 13:27:17 +01:00 committed by Paul Davis
parent 6bfe2c5d37
commit add37c6b96
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gtk2_ardour/editor_ops.cc
View File

@ -3263,34 +3263,39 @@ Editor::crop_region_to (framepos_t start, framepos_t end)
for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists.begin(); i != playlists.end(); ++i) { for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists.begin(); i != playlists.end(); ++i) {
boost::shared_ptr<Region> region; /* Only the top regions at start and end have to be cropped */
boost::shared_ptr<Region> region_at_start = (*i)->top_region_at(start);
boost::shared_ptr<Region> region_at_end = (*i)->top_region_at(end);
the_start = start; vector<boost::shared_ptr<Region>> regions;
if ((region = (*i)->top_region_at(the_start)) == 0) { if (region_at_start != 0) {
continue; regions.push_back (region_at_start);
}
if (region_at_end != 0) {
regions.push_back (region_at_end);
} }
/* now adjust lengths to that we do the right thing /* now adjust lengths */
if the selection extends beyond the region for (vector<boost::shared_ptr<Region>>::iterator i = regions.begin(); i != regions.end(); ++i) {
*/
the_start = max (the_start, (framepos_t) region->position()); the_start = max (start, (framepos_t) (*i)->position());
if (max_framepos - the_start < region->length()) { if (max_framepos - the_start < (*i)->length()) {
the_end = the_start + region->length() - 1; the_end = the_start + (*i)->length() - 1;
} else { } else {
the_end = max_framepos; the_end = max_framepos;
} }
the_end = min (end, the_end); the_end = min (end, the_end);
cnt = the_end - the_start + 1; cnt = the_end - the_start + 1;
if(!in_command) { if(!in_command) {
begin_reversible_command (_("trim to selection")); begin_reversible_command (_("trim to selection"));
in_command = true; in_command = true;
}
(*i)->clear_changes ();
(*i)->trim_to (the_start, cnt);
_session->add_command (new StatefulDiffCommand (*i));
} }
region->clear_changes ();
region->trim_to (the_start, cnt);
_session->add_command (new StatefulDiffCommand (region));
} }
if (in_command) { if (in_command) {