Revert internals of the last layering-related commit, and go back a slightly-cleaned-up version of how it was before. Remove all layering modes; only option now is add-is-higher. Move-add-higher could easily be re-added if anyone uses it.

git-svn-id: svn://localhost/ardour2/branches/3.0@11111 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 0 insertions, 16 deletions

diff --git a/libs/ardour/ardour/region_sorters.h b/libs/ardour/ardour/region_sorters.h
index 0e3203ef20..baa3a3417d 100644
--- a/libs/ardour/ardour/region_sorters.h
+++ b/libs/ardour/ardour/region_sorters.h
@@ -36,22 +36,6 @@ struct RegionSortByLayer {
 	}
 };
 
-struct RegionSortByAdd {
-	bool operator() (boost::shared_ptr<Region> a, boost::shared_ptr<Region> b) {
-		return (
-			(a->last_layer_op (LayerOpAdd) < b->last_layer_op (LayerOpAdd))
-			);
-	}
-};
-
-struct RegionSortByAddOrBounds {
-	bool operator() (boost::shared_ptr<Region> a, boost::shared_ptr<Region> b) {
-		uint64_t const p = std::max (a->last_layer_op (LayerOpAdd), a->last_layer_op (LayerOpBoundsChange));
-		uint64_t const q = std::max (b->last_layer_op (LayerOpAdd), b->last_layer_op (LayerOpBoundsChange));
-		return p < q;
-	}
-};
-
 } // namespace
 
 #endif /* __libardour_region_sorters_h__ */