From 0040ab5158d651a3ab499ead2dbdebaf8aa306b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Nusser?= Date: Thu, 3 Dec 2015 18:45:47 +0100 Subject: [PATCH] Fix "Crop Region to Range" -- second attempt. --- gtk2_ardour/editor_ops.cc | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 9dfdd48eba..7402d23147 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -3256,9 +3256,10 @@ Editor::crop_region_to (framepos_t start, framepos_t end) return; } - framepos_t the_start; - framepos_t the_end; - framepos_t cnt; + framepos_t pos; + framepos_t new_start; + framepos_t new_end; + framecnt_t new_length; bool in_command = false; for (vector >::iterator i = playlists.begin(); i != playlists.end(); ++i) { @@ -3279,21 +3280,22 @@ Editor::crop_region_to (framepos_t start, framepos_t end) /* now adjust lengths */ for (vector >::iterator i = regions.begin(); i != regions.end(); ++i) { - the_start = max (start, (framepos_t) (*i)->position()); - if (max_framepos - the_start < (*i)->length()) { - the_end = the_start + (*i)->length() - 1; + pos = (*i)->position(); + new_start = max (start, pos); + if (max_framepos - pos > (*i)->length()) { + new_end = pos + (*i)->length() - 1; } else { - the_end = max_framepos; + new_end = max_framepos; } - the_end = min (end, the_end); - cnt = the_end - the_start + 1; + new_end = min (end, new_end); + new_length = new_end - new_start + 1; if(!in_command) { begin_reversible_command (_("trim to selection")); in_command = true; } (*i)->clear_changes (); - (*i)->trim_to (the_start, cnt); + (*i)->trim_to (new_start, new_length); _session->add_command (new StatefulDiffCommand (*i)); } }