diff options
author | nick_m <mainsbridge@gmail.com> | 2015-05-10 03:15:50 +1000 |
---|---|---|
committer | nick_m <mainsbridge@gmail.com> | 2015-05-10 03:15:50 +1000 |
commit | 13f34f392248e6457d1afed010fcdcbfda890328 (patch) | |
tree | 988dd9f155925ecb0f205a4929e33a2c1735dc03 /libs/ardour/playlist.cc | |
parent | 79c0373b32879e41443b8f3948633b2f2fbffbc4 (diff) |
Layering - the return of "later is higher".
Currently we don't do anything special on layering prefs change
(relayer only occurs when each playlist is first edited). The idea here is
that "undo" is still available to restore previous layering in case of any
surprises.
Diffstat (limited to 'libs/ardour/playlist.cc')
-rw-r--r-- | libs/ardour/playlist.cc | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index d121ee04ff..20a2ef0197 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -2333,7 +2333,10 @@ struct RelayerSort { void Playlist::set_layer (boost::shared_ptr<Region> region, double new_layer) { - /* Remove the layer we are setting from our region list, and sort it */ + /* Remove the layer we are setting from our region list, and sort it + * using the layer indeces. + */ + RegionList copy = regions.rlist(); copy.remove (region); copy.sort (RelayerSort ()); @@ -2362,6 +2365,12 @@ Playlist::setup_layering_indices (RegionList const & regions) } } +struct LaterHigherSort { + bool operator () (boost::shared_ptr<Region> a, boost::shared_ptr<Region> b) { + return a->position() < b->position(); + } +}; + /** Take the layering indices of each of our regions, compute the layers * that they should be on, and write the layers back to the regions. */ @@ -2396,9 +2405,16 @@ Playlist::relayer () vector<vector<RegionList> > layers; layers.push_back (vector<RegionList> (divisions)); - /* Sort our regions into layering index order */ + /* Sort our regions into layering index order (for manual layering) or position order (for later is higher)*/ RegionList copy = regions.rlist(); - copy.sort (RelayerSort ()); + switch (Config->get_layer_model()) { + case LaterHigher: + copy.sort (LaterHigherSort ()); + break; + case Manual: + copy.sort (RelayerSort ()); + break; + } DEBUG_TRACE (DEBUG::Layering, "relayer() using:\n"); for (RegionList::iterator i = copy.begin(); i != copy.end(); ++i) { |