smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-04 04:39:33 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'chaot4-fix_duplicate_fencepost_error'

Browse source
This commit is contained in:
Paul Davis 2015-11-04 17:50:24 -05:00
commit 81fe5ac7a2
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/editor_ops.cc
View file

@ -4775,7 +4775,7 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times)
framepos_t const start_frame = regions.start ();
framepos_t const end_frame = regions.end_frame ();
framecnt_t const gap = end_frame - start_frame;
framecnt_t const gap = end_frame - start_frame + 1;
begin_reversible_command (Operations::duplicate_region);
@ -4790,7 +4790,7 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times)
latest_regionviews.clear ();
sigc::connection c = rtv->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view));
framepos_t const position = end_frame + (r->first_frame() - start_frame);
framepos_t const position = end_frame + (r->first_frame() - start_frame + 1);
playlist = (*i)->region()->playlist();
playlist->clear_changes ();
playlist->duplicate (r, position, gap, times);
@ -4841,7 +4841,7 @@ Editor::duplicate_selection (float times)
} else {
end = selection->time.end_frame();
}
playlist->duplicate (*ri, end, times);
playlist->duplicate (*ri, end + 1, times);
if (!in_command) {
begin_reversible_command (_("duplicate selection"));

7
libs/ardour/playlist.cc
View file

@ -1256,13 +1256,12 @@ Playlist::flush_notifications (bool from_undo)
RegionWriteLock rl (this);
int itimes = (int) floor (times);
framepos_t pos = position + 1;
while (itimes--) {
boost::shared_ptr<Region> copy = RegionFactory::create (region, true);
add_region_internal (copy, pos);
add_region_internal (copy, position);
set_layer (copy, DBL_MAX);
pos += gap;
position += gap;
}
if (floor (times) != times) {
@ -1278,7 +1277,7 @@ Playlist::flush_notifications (bool from_undo)
plist.add (Properties::name, name);
boost::shared_ptr<Region> sub = RegionFactory::create (region, plist);
add_region_internal (sub, pos);
add_region_internal (sub, position);
set_layer (sub, DBL_MAX);
}
}

4
libs/ardour/test/profiling/lots_of_regions.cc
View file

@ -35,7 +35,7 @@ main (int argc, char* argv[])
/* Duplicate it a lot */
session->begin_reversible_command ("foo");
playlist->clear_changes ();
playlist->duplicate (region, region->last_frame(), 1000);
playlist->duplicate (region, region->last_frame() + 1, 1000);
session->add_command (new StatefulDiffCommand (playlist));
session->commit_reversible_command ();
@ -45,7 +45,7 @@ main (int argc, char* argv[])
/* And do it again */
session->begin_reversible_command ("foo");
playlist->clear_changes ();
playlist->duplicate (region, region->last_frame(), 1000);
playlist->duplicate (region, region->last_frame() + 1, 1000);
session->add_command (new StatefulDiffCommand (playlist));
session->commit_reversible_command ();
}