Set up layering_index immediately on an explicit layer, so that undo

works properly.  Stop the layer being a stateful property, as it is
always derived from layering_index, unambigiously, by relayer().


git-svn-id: svn://localhost/ardour2/branches/3.0@11120 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-12-30 20:05:48 +00:00
parent 2c23ff8ceb
commit dd53e7284a
9 changed files with 83 additions and 105 deletions

View file

@ -1047,7 +1047,7 @@ RegionMoveDrag::finished_no_copy (
boost::shared_ptr<Playlist> playlist = dest_rtv->playlist();
if (dest_rtv->view()->layer_display() == Stacked || dest_rtv->view()->layer_display() == Expanded) {
rv->region()->set_pending_layer (dest_layer);
playlist->set_layer (rv->region(), dest_layer);
}
/* freeze playlist to avoid lots of relayering in the case of a multi-region drag */
@ -1192,7 +1192,7 @@ RegionMoveDrag::insert_region_into_playlist (
dest_playlist->add_region (region, where);
if (dest_rtv->view()->layer_display() == Stacked || dest_rtv->view()->layer_display() == Expanded) {
region->set_pending_layer (dest_layer);
dest_playlist->set_layer (region, dest_layer);
}
c.disconnect ();