ardour/livetrax
13
0
Fork 0
Code

cleanup mess from manual rebase against master (GUI edition)

Browse Source
This commit is contained in:
Paul Davis 2021-05-04 15:34:17 -06:00
parent ba3fc66aa5
commit dec3b9bc2e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/editor_ops.cc
View File

@ -3894,7 +3894,7 @@ Editor::trim_region_to_location (const Location& loc, const char* str)
/* require region to span proposed trim */ /* require region to span proposed trim */
switch (rv->region()->coverage (loc.start(), loc.end())) { switch (rv->region()->coverage (loc.start(), loc.end())) {
case Evoral::OverlapNone: case Temporal::OverlapNone:
break; break;
default: default:
continue; continue;
@ -4831,7 +4831,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs)
case Copy: case Copy:
/* copy region before adding, so we're not putting same object into two different playlists */ /* copy region before adding, so we're not putting same object into two different playlists */
npl->add_region (RegionFactory::create (r, false), r->position() - first_position); npl->add_region (RegionFactory::create (r, false), timepos_t (first_position.distance (r->position())));
break; break;
case Clear: case Clear: