ardour/livetrax
13
0
Fork 0
Code

On switching from explicit to implicit relayering, attempt to ensure that any layering set up

Browse Source 
whilst in explicit mode will be preserved on subsequent implicit relayer operations.


git-svn-id: svn://localhost/ardour2/branches/3.0@5591 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-08-26 00:34:06 +00:00
parent 28af0265b5
commit b1e69d4b7b
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/ardour/playlist.h
View File

@ -162,9 +162,8 @@ class Playlist : public SessionObject,
bool explicit_relayering () const { bool explicit_relayering () const {
return _explicit_relayering; return _explicit_relayering;
} }
void set_explicit_relayering (bool e) {
_explicit_relayering = e; void set_explicit_relayering (bool e);
}
protected: protected:
friend class Session; friend class Session;

22
libs/ardour/playlist.cc
View File

@ -2465,4 +2465,24 @@ Playlist::foreach_region (sigc::slot<void, boost::shared_ptr<Region> > s)
} }
} }
void
Playlist::set_explicit_relayering (bool e)
{
if (e == false && _explicit_relayering == true) {
/* We are changing from explicit to implicit relayering; layering may have been changed whilst
we were in explicit mode, and we don't want that to be undone next time an implicit relayer
occurs. Hence now we'll set up region last_layer_op values so that an implicit relayer
at this point would keep regions on the same layers.
From then on in, it's just you and your towel.
*/
RegionLock rl (this);
for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
(*i)->set_last_layer_op ((*i)->layer ());
}
}
_explicit_relayering = e;
}