add IsSkip enum to enums.cc

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

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 2a38cd2c8a88bf3ce507df209de936a483e0ed08..84755cb913b34931dc04ff8a56e418c0bb3ef4a9 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -74,8 +74,6 @@ setup_enum_writer ()
        AFLPosition _AFLPosition;
        RemoteModel _RemoteModel;
        DenormalModel _DenormalModel;
-       CrossfadeModel _CrossfadeModel;
-       CrossfadeChoice _CrossfadeChoice;
        InsertMergePolicy _InsertMergePolicy;
        ListenPosition _ListenPosition;
        SampleFormat _SampleFormat;
@@ -95,7 +93,6 @@ setup_enum_writer ()
        AutoState _AutoState;
        AutoStyle _AutoStyle;
        AutoConnectOption _AutoConnectOption;
-       RouteSortOrderKey _RouteSortOrderKey;
        Session::StateOfTheState _Session_StateOfTheState;
        Route::Flag _Route_Flag;
        Source::Flag _Source_Flag;
@@ -180,6 +177,7 @@ setup_enum_writer ()
        REGISTER_ENUM (MeterKrms);
        REGISTER_ENUM (MeterK20);
        REGISTER_ENUM (MeterK14);
+       REGISTER_ENUM (MeterK12);
        REGISTER_ENUM (MeterIEC1DIN);
        REGISTER_ENUM (MeterIEC1NOR);
        REGISTER_ENUM (MeterIEC2BBC);
@@ -237,8 +235,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,17 +285,13 @@ 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);
+       /*
+        * EditorOrdered has been deprecated
+        * since the removal of independent 
+        * editor / mixer ordering.
+       */
+       enum_writer.add_to_hack_table ("EditorOrdered", "MixerOrdered");
 
         REGISTER_ENUM (InsertMergeReject);
         REGISTER_ENUM (InsertMergeRelax);
@@ -369,8 +369,10 @@ 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, StopOnce);
        REGISTER_CLASS_ENUM (SessionEvent, AutoLoop);
+       REGISTER_CLASS_ENUM (SessionEvent, Skip);
        REGISTER (_SessionEvent_Type);
 
        REGISTER_CLASS_ENUM (Session, Stopped);
@@ -434,10 +436,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);
@@ -446,6 +444,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);
@@ -467,6 +466,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);
@@ -793,34 +793,6 @@ std::ostream& operator<<(std::ostream& o, const InsertMergePolicy& 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::string s = enum_2_string (var);
-       return o << s;
-}
-
-std::istream& operator>>(std::istream& o, CrossfadeChoice& var)
-{
-       std::string s;
-       o >> s;
-       var = (CrossfadeChoice) string_2_enum (s, var);
-       return o;
-}
-
-std::ostream& operator<<(std::ostream& o, const CrossfadeChoice& var)
-{
-       std::string s = enum_2_string (var);
-       return o << s;
-}
-
 std::istream& operator>>(std::istream& o, SyncSource& var)
 {
        std::string s;
@@ -940,3 +912,16 @@ 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;
+}