ardour/livetrax
13
0
Fork 0
Code

Fix layering when copy/pasting regions (1/2)

Browse Source 
Playlist::add_region, Playlist::add_region_internal always
adds the region to the top of the playlist, ignoring the
region's layer.

Note that there is also difference between
Region::layer and Region::layering_index.
This commit is contained in:
Robin Gareus 2023-09-25 22:15:08 +02:00
parent 5fe127eb49
commit 496957efdf
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/ardour/playlist.cc
View File

@ -185,6 +185,9 @@ Playlist::Playlist (std::shared_ptr<const Playlist> other, string namestr, bool
ThawList thawlist;
other->copy_regions (tmp);
RegionSortByLayer cmp;
tmp.sort (cmp);
in_set_state++;
for (list<std::shared_ptr<Region> >::iterator x = tmp.begin(); x != tmp.end(); ++x) {
@ -273,10 +276,10 @@ Playlist::Playlist (std::shared_ptr<const Playlist> other, timepos_t const & sta
new_region = RegionFactory::create (region, offset, plist, true, &rlock.thawlist);
add_region_internal (new_region, position, rlock.thawlist);
set_layer (new_region, region->layer ());
}
}
/* keep track of any dead space at end (for pasting into Ripple or
* RippleAll mode) at the end of construction, any length of cnt beyond
* the extents of the regions is end_space
@ -286,6 +289,8 @@ Playlist::Playlist (std::shared_ptr<const Playlist> other, timepos_t const & sta
in_set_state--;
first_set_state = false;
relayer ();
}
void
@ -1321,7 +1326,8 @@ Playlist::paste (std::shared_ptr<Playlist> other, timepos_t const & position, fl
*/
add_region_internal (copy_of_region, r->position() + pos, rl1.thawlist);
set_layer (copy_of_region, copy_of_region->layer() + top);
copy_of_region->set_layer (r->layer() + top);
set_layer (copy_of_region, copy_of_region->layer());
}
pos += shift;
}