Revert to old Lock mode (still called Lock).

[ardour.git] / libs / ardour / enums.cc

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index bc60dfcb09033ba0b5cb9060d048a2a9906d5605..a1cf8d090cf972c5f4b147071b01026bc24fd240 100644 (file)
--- 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;
@@ -187,6 +188,7 @@ setup_enum_writer ()
        REGISTER_ENUM (MeterIEC2BBC);
        REGISTER_ENUM (MeterIEC2EBU);
        REGISTER_ENUM (MeterVU);
+       REGISTER_ENUM (MeterPeak0dB);
        REGISTER (_MeterType);
 
        REGISTER_ENUM (Normal);
@@ -297,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);
@@ -804,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)
 {