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.

1 files changed, 19 insertions, 1 deletions

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index b5a7447ab8..a1cf8d090c 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -74,6 +74,7 @@ setup_enum_writer ()
 	AFLPosition _AFLPosition;
 	RemoteModel _RemoteModel;
 	DenormalModel _DenormalModel;
+	LayerModel _LayerModel;
 	InsertMergePolicy _InsertMergePolicy;
 	ListenPosition _ListenPosition;
 	SampleFormat _SampleFormat;
@@ -298,7 +299,11 @@ setup_enum_writer ()
 	*/
 	enum_writer.add_to_hack_table ("EditorOrdered", "MixerOrdered");
 
-        REGISTER_ENUM (InsertMergeReject);
+	REGISTER_ENUM (LaterHigher);
+	REGISTER_ENUM (Manual);
+	REGISTER (_LayerModel);
+
+	REGISTER_ENUM (InsertMergeReject);
         REGISTER_ENUM (InsertMergeRelax);
         REGISTER_ENUM (InsertMergeReplace);
         REGISTER_ENUM (InsertMergeTruncateExisting);
@@ -805,6 +810,19 @@ std::ostream& operator<<(std::ostream& o, const ListenPosition& var)
 	std::string s = enum_2_string (var);
 	return o << s;
 }
+std::istream& operator>>(std::istream& o, LayerModel& var)
+{
+	std::string s;
+	o >> s;
+	var = (LayerModel) string_2_enum (s, var);
+	return o;
+}
+
+std::ostream& operator<<(std::ostream& o, const LayerModel& var)
+{
+	std::string s = enum_2_string (var);
+	return o << s;
+}
 
 std::istream& operator>>(std::istream& o, InsertMergePolicy& var)
 {