ardour/livetrax
13
0
Fork 0
Code

Retain Region layering when duplicating Regions

Browse Source 
Editor::duplicate copies regions one at a time. This lead
to region layeres not being retained, particularly since
Playlist::duplicate() puts the duplicated layer at the top.
This commit is contained in:
Robin Gareus 2023-11-07 00:57:22 +01:00
parent 58652f6268
commit 7cd681ec9e
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gtk2_ardour/editor_ops.cc
View File

@ -5402,13 +5402,23 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times)
std::vector<sigc::connection> cl; std::vector<sigc::connection> cl;
std::shared_ptr<Playlist> playlist; std::shared_ptr<Playlist> playlist;
PlaylistSet playlists; // list of unique playlists affected by duplication PlaylistSet playlists; // list of unique playlists affected by duplication
RegionSelection sel = regions; // clear (below) may clear the argument list if its the current region selection
RegionSelection foo; RegionSelection foo;
timepos_t const start_time = regions.start_time (); timepos_t const start_time = regions.start_time ();
timepos_t const end_time = regions.end_time ().increment(); timepos_t const end_time = regions.end_time ().increment();
timecnt_t const span = start_time.distance (end_time); timecnt_t const span = start_time.distance (end_time);
RegionList rl;
for (auto const& rs : regions) {
rl.push_back (rs->region ());
TimeAxisView& tv = rs->get_time_axis_view();
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&tv);
cl.push_back (rtv->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view)));
}
rl.sort ([](std::shared_ptr<Region> const& a, std::shared_ptr<Region> const& b) { return a->layering_index () < b->layering_index (); });
begin_reversible_command (Operations::duplicate_region); begin_reversible_command (Operations::duplicate_region);
selection->clear_regions (); selection->clear_regions ();
@ -5421,9 +5431,9 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times)
RegionList exclude; RegionList exclude;
for (RegionSelection::iterator i = sel.begin(); i != sel.end(); ++i) { for (auto const& r : rl) {
exclude.push_back ((*i)->region()); exclude.push_back (r);
playlist = (*i)->region()->playlist(); playlist = r->playlist();
if (playlists.insert (playlist).second) { if (playlists.insert (playlist).second) {
/* successfully inserted into set, so it's the first time we've seen this playlist */ /* successfully inserted into set, so it's the first time we've seen this playlist */
playlist->clear_changes (); playlist->clear_changes ();
@ -5437,13 +5447,7 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times)
} }
} }
for (RegionSelection::iterator i = sel.begin(); i != sel.end(); ++i) { for (auto const& r : rl) {
std::shared_ptr<Region> r ((*i)->region());
TimeAxisView& tv = (*i)->get_time_axis_view();
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&tv);
cl.push_back (rtv->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view)));
/* XXX problem arew here. When duplicating audio regions, the /* XXX problem arew here. When duplicating audio regions, the
* next one must be positioned 1 sample after the end of the * next one must be positioned 1 sample after the end of the
@ -5462,7 +5466,7 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times)
timepos_t position = end_time; timepos_t position = end_time;
position += start_time.distance (r->position()); position += start_time.distance (r->position());
playlist = (*i)->region()->playlist(); playlist = r->playlist();
if (!should_ripple()) { if (!should_ripple()) {
if (playlists.insert (playlist).second) { if (playlists.insert (playlist).second) {