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 bab0e8ed15c5daad3abdc01cc5d4649612f2276e..a1cf8d090cf972c5f4b147071b01026bc24fd240 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -74,8 +74,7 @@ setup_enum_writer ()
        AFLPosition _AFLPosition;
        RemoteModel _RemoteModel;
        DenormalModel _DenormalModel;
-       CrossfadeModel _CrossfadeModel;
-       CrossfadeChoice _CrossfadeChoice;
+       LayerModel _LayerModel;
        InsertMergePolicy _InsertMergePolicy;
        ListenPosition _ListenPosition;
        SampleFormat _SampleFormat;
@@ -87,15 +86,16 @@ setup_enum_writer ()
        ShuttleUnits _ShuttleUnits;
        Session::RecordState _Session_RecordState;
        SessionEvent::Type _SessionEvent_Type;
+       SessionEvent::Action _SessionEvent_Action;
        TimecodeFormat _Session_TimecodeFormat;
        Session::PullupFormat _Session_PullupFormat;
        FadeShape _FadeShape;
+       RegionSelectionAfterSplit _RegionSelectionAfterSplit;
        IOChange _IOChange;
        AutomationType _AutomationType;
        AutoState _AutoState;
        AutoStyle _AutoStyle;
        AutoConnectOption _AutoConnectOption;
-       RouteSortOrderKey _RouteSortOrderKey;
        Session::StateOfTheState _Session_StateOfTheState;
        Route::Flag _Route_Flag;
        Source::Flag _Source_Flag;
@@ -136,10 +136,12 @@ setup_enum_writer ()
 #define REGISTER_CLASS_ENUM(t,e) i.push_back (t::e); s.push_back (#e)
 
        REGISTER_ENUM (GainAutomation);
+       REGISTER_ENUM (TrimAutomation);
        REGISTER_ENUM (PanAzimuthAutomation);
        REGISTER_ENUM (PanElevationAutomation);
        REGISTER_ENUM (PanWidthAutomation);
        REGISTER_ENUM (PluginAutomation);
+       REGISTER_ENUM (PluginPropertyAutomation);
        REGISTER_ENUM (SoloAutomation);
        REGISTER_ENUM (MuteAutomation);
        REGISTER_ENUM (MidiCCAutomation);
@@ -180,11 +182,13 @@ setup_enum_writer ()
        REGISTER_ENUM (MeterKrms);
        REGISTER_ENUM (MeterK20);
        REGISTER_ENUM (MeterK14);
+       REGISTER_ENUM (MeterK12);
        REGISTER_ENUM (MeterIEC1DIN);
        REGISTER_ENUM (MeterIEC1NOR);
        REGISTER_ENUM (MeterIEC2BBC);
        REGISTER_ENUM (MeterIEC2EBU);
        REGISTER_ENUM (MeterVU);
+       REGISTER_ENUM (MeterPeak0dB);
        REGISTER (_MeterType);
 
        REGISTER_ENUM (Normal);
@@ -237,8 +241,14 @@ setup_enum_writer ()
 
        REGISTER_ENUM (Slide);
        REGISTER_ENUM (Splice);
+       REGISTER_ENUM (Ripple); // XXX do the old enum values have to stay in order?
        REGISTER_ENUM (Lock);
        REGISTER (_EditMode);
+       /*
+        * Splice mode is undefined, undocumented, and basically fubar'ed
+        * perhaps someday we will make it work.  but for now, avoid it
+       */
+       enum_writer.add_to_hack_table ("Splice", "Slide");
 
        REGISTER_ENUM (Start);
        REGISTER_ENUM (End);
@@ -281,19 +291,19 @@ setup_enum_writer ()
 
        REGISTER_ENUM (UserOrdered);
        REGISTER_ENUM (MixerOrdered);
-       REGISTER_ENUM (EditorOrdered);
        REGISTER (_RemoteModel);
-
-       REGISTER_ENUM (FullCrossfade);
-       REGISTER_ENUM (ShortCrossfade);
-       REGISTER (_CrossfadeModel);
-
-       REGISTER_ENUM (RegionFades);
-       REGISTER_ENUM (ConstantPowerMinus3dB);
-       REGISTER_ENUM (ConstantPowerMinus6dB);
-       REGISTER (_CrossfadeChoice);
-
-        REGISTER_ENUM (InsertMergeReject);
+       /*
+        * EditorOrdered has been deprecated
+        * since the removal of independent 
+        * editor / mixer ordering.
+       */
+       enum_writer.add_to_hack_table ("EditorOrdered", "MixerOrdered");
+
+       REGISTER_ENUM (LaterHigher);
+       REGISTER_ENUM (Manual);
+       REGISTER (_LayerModel);
+
+       REGISTER_ENUM (InsertMergeReject);
         REGISTER_ENUM (InsertMergeRelax);
         REGISTER_ENUM (InsertMergeReplace);
         REGISTER_ENUM (InsertMergeTruncateExisting);
@@ -336,6 +346,7 @@ setup_enum_writer ()
 
        REGISTER_ENUM (MTC);
        REGISTER_ENUM (JACK);
+       REGISTER_ENUM (Engine);
        REGISTER_ENUM (MIDIClock);
        REGISTER_ENUM (LTC);
        REGISTER (_SyncSource);
@@ -368,10 +379,23 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (SessionEvent, Audition);
        REGISTER_CLASS_ENUM (SessionEvent, InputConfigurationChange);
        REGISTER_CLASS_ENUM (SessionEvent, SetPlayAudioRange);
+       REGISTER_CLASS_ENUM (SessionEvent, CancelPlayAudioRange);
+       REGISTER_CLASS_ENUM (SessionEvent, RealTimeOperation);
+       REGISTER_CLASS_ENUM (SessionEvent, AdjustPlaybackBuffering);
+       REGISTER_CLASS_ENUM (SessionEvent, AdjustCaptureBuffering);
+       REGISTER_CLASS_ENUM (SessionEvent, SetTimecodeTransmission);
+       REGISTER_CLASS_ENUM (SessionEvent, Skip);
        REGISTER_CLASS_ENUM (SessionEvent, StopOnce);
        REGISTER_CLASS_ENUM (SessionEvent, AutoLoop);
+       REGISTER_CLASS_ENUM (SessionEvent, AutoLoopDeclick);
        REGISTER (_SessionEvent_Type);
 
+       REGISTER_CLASS_ENUM (SessionEvent, Add);
+       REGISTER_CLASS_ENUM (SessionEvent, Remove);
+       REGISTER_CLASS_ENUM (SessionEvent, Replace);
+       REGISTER_CLASS_ENUM (SessionEvent, Clear);
+       REGISTER (_SessionEvent_Action);
+       
        REGISTER_CLASS_ENUM (Session, Stopped);
        REGISTER_CLASS_ENUM (Session, Waiting);
        REGISTER_CLASS_ENUM (Session, Running);
@@ -433,10 +457,6 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Route, MonitorOut);
        REGISTER_BITS (_Route_Flag);
 
-       REGISTER_ENUM (MixerSort);
-       REGISTER_ENUM (EditorSort);
-       REGISTER (_RouteSortOrderKey);
-
        REGISTER_CLASS_ENUM (Source, Writable);
        REGISTER_CLASS_ENUM (Source, CanRename);
        REGISTER_CLASS_ENUM (Source, Broadcast);
@@ -445,6 +465,7 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Source, RemoveAtDestroy);
        REGISTER_CLASS_ENUM (Source, NoPeakFile);
        REGISTER_CLASS_ENUM (Source, Destructive);
+       REGISTER_CLASS_ENUM (Source, Empty);
        REGISTER_BITS (_Source_Flag);
 
        REGISTER_ENUM (FadeLinear);
@@ -454,6 +475,16 @@ setup_enum_writer ()
        REGISTER_ENUM (FadeSymmetric);
        REGISTER (_FadeShape);
 
+       REGISTER_ENUM(None);
+       REGISTER_ENUM(NewlyCreatedLeft);
+       REGISTER_ENUM(NewlyCreatedRight);
+       REGISTER_ENUM(NewlyCreatedBoth);
+       REGISTER_ENUM(Existing);
+       REGISTER_ENUM(ExistingNewlyCreatedLeft);
+       REGISTER_ENUM(ExistingNewlyCreatedRight);
+       REGISTER_ENUM(ExistingNewlyCreatedBoth);
+       REGISTER (_RegionSelectionAfterSplit);
+
        REGISTER_CLASS_ENUM (Diskstream, Recordable);
        REGISTER_CLASS_ENUM (Diskstream, Hidden);
        REGISTER_CLASS_ENUM (Diskstream, Destructive);
@@ -466,6 +497,7 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Location, IsCDMarker);
        REGISTER_CLASS_ENUM (Location, IsSessionRange);
        REGISTER_CLASS_ENUM (Location, IsRangeMarker);
+       REGISTER_CLASS_ENUM (Location, IsSkip);
        REGISTER_BITS (_Location_Flags);
 
        REGISTER_CLASS_ENUM (Track, NoFreeze);
@@ -778,43 +810,28 @@ 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, InsertMergePolicy& var)
+std::istream& operator>>(std::istream& o, LayerModel& var)
 {
        std::string s;
        o >> s;
-       var = (InsertMergePolicy) string_2_enum (s, var);
+       var = (LayerModel) string_2_enum (s, var);
        return o;
 }
-std::ostream& operator<<(std::ostream& o, const InsertMergePolicy& var)
-{
-       std::string s = enum_2_string (var);
-       return o << s;
-}
 
-std::istream& operator>>(std::istream& o, CrossfadeModel& var)
-{
-       std::string s;
-       o >> s;
-       var = (CrossfadeModel) string_2_enum (s, var);
-       return o;
-}
-
-std::ostream& operator<<(std::ostream& o, const CrossfadeModel& var)
+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, CrossfadeChoice& var)
+std::istream& operator>>(std::istream& o, InsertMergePolicy& var)
 {
        std::string s;
        o >> s;
-       var = (CrossfadeChoice) string_2_enum (s, var);
+       var = (InsertMergePolicy) string_2_enum (s, var);
        return o;
 }
-
-std::ostream& operator<<(std::ostream& o, const CrossfadeChoice& var)
+std::ostream& operator<<(std::ostream& o, const InsertMergePolicy& var)
 {
        std::string s = enum_2_string (var);
        return o << s;
@@ -939,3 +956,31 @@ std::ostream& operator<<(std::ostream& o, const Evoral::OverlapType& var)
        std::string s = enum_2_string (var);
        return o << s;
 }
+
+std::istream& operator>>(std::istream& o, FadeShape& var)
+{
+       std::string s;
+       o >> s;
+       var = (FadeShape) string_2_enum (s, var);
+       return o;
+}
+
+std::ostream& operator<<(std::ostream& o, const FadeShape& var)
+{
+       std::string s = enum_2_string (var);
+       return o << s;
+}
+
+std::istream& operator>>(std::istream& o, RegionSelectionAfterSplit& var)
+{
+       std::string s;
+       o >> s;
+       var = (RegionSelectionAfterSplit) string_2_enum (s, var);
+       return o;
+}
+
+std::ostream& operator<<(std::ostream& o, const RegionSelectionAfterSplit& var)
+{
+       std::string s = enum_2_string (var);
+       return o << s;
+}