Thought-to-be-fix for #2794; fix route process order sorting.

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

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index be61b2acb2bbbf33de9e5876067cc583db314f7b..bde6d7a7fe8b8d6c4908ae6a463fea17b7580051 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -48,7 +48,7 @@ namespace ARDOUR {
 void
 setup_enum_writer ()
 {
-       EnumWriter* enum_writer = new EnumWriter();
+       EnumWriter& enum_writer (EnumWriter::instance());
        vector<int> i;
        vector<string> s;
 
@@ -69,6 +69,7 @@ setup_enum_writer ()
        DenormalModel _DenormalModel;
        CrossfadeModel _CrossfadeModel;
        LayerModel _LayerModel;
+       InsertMergePolicy _InsertMergePolicy;
        ListenPosition _ListenPosition;
        SampleFormat _SampleFormat;
        CDMarkerFormat _CDMarkerFormat;
@@ -81,7 +82,7 @@ setup_enum_writer ()
        SessionEvent::Type _SessionEvent_Type;
        TimecodeFormat _Session_TimecodeFormat;
        Session::PullupFormat _Session_PullupFormat;
-       AudioRegion::FadeShape _AudioRegion_FadeShape;
+       FadeShape _FadeShape;
        Panner::LinkDirection _Panner_LinkDirection;
        IOChange _IOChange;
        AutomationType _AutomationType;
@@ -93,10 +94,7 @@ setup_enum_writer ()
        Source::Flag _Source_Flag;
        Diskstream::Flag _Diskstream_Flag;
        Location::Flags _Location_Flags;
-       RouteGroup::Flag _RouteGroup_Flag;
-       RouteGroup::Property _RouteGroup_Property;
-       Region::Flag _Region_Flag;
-       Region::PositionLockStyle _Region_PositionLockStyle;
+       PositionLockStyle _PositionLockStyle;
        Track::FreezeState _Track_FreezeState;
        AutomationList::InterpolationStyle _AutomationList_InterpolationStyle;
        AnyTime::Type _AnyTime_Type;
@@ -122,16 +120,11 @@ setup_enum_writer ()
        Session::SlaveState _Session_SlaveState;
        MTC_Status _MIDI_MTC_Status;
 
-#define REGISTER(e) enum_writer->register_distinct (typeid(e).name(), i, s); i.clear(); s.clear()
-#define REGISTER_BITS(e) enum_writer->register_bits (typeid(e).name(), i, s); i.clear(); s.clear()
+#define REGISTER(e) enum_writer.register_distinct (typeid(e).name(), i, s); i.clear(); s.clear()
+#define REGISTER_BITS(e) enum_writer.register_bits (typeid(e).name(), i, s); i.clear(); s.clear()
 #define REGISTER_ENUM(e) i.push_back (e); s.push_back (#e)
 #define REGISTER_CLASS_ENUM(t,e) i.push_back (t::e); s.push_back (#e)
 
-       REGISTER_ENUM (NoChange);
-       REGISTER_ENUM (ConfigurationChanged);
-       REGISTER_ENUM (ConnectionsChanged);
-       REGISTER_BITS (_IOChange);
-
        REGISTER_ENUM (OverlapNone);
        REGISTER_ENUM (OverlapInternal);
        REGISTER_ENUM (OverlapStart);
@@ -241,6 +234,14 @@ setup_enum_writer ()
        REGISTER_ENUM (MoveAddHigher);
        REGISTER_ENUM (AddHigher);
        REGISTER (_LayerModel);
+        
+        REGISTER_ENUM (InsertMergeReject);
+        REGISTER_ENUM (InsertMergeRelax);
+        REGISTER_ENUM (InsertMergeReplace);
+        REGISTER_ENUM (InsertMergeTruncateExisting);
+        REGISTER_ENUM (InsertMergeTruncateAddition);
+        REGISTER_ENUM (InsertMergeExtend);
+        REGISTER (_InsertMergePolicy);
 
        REGISTER_ENUM (AfterFaderListen);
        REGISTER_ENUM (PreFaderListen);
@@ -293,7 +294,7 @@ setup_enum_writer ()
        REGISTER (_Session_RecordState);
 
        REGISTER_CLASS_ENUM (SessionEvent, SetTransportSpeed);
-       REGISTER_CLASS_ENUM (SessionEvent, SetDiskstreamSpeed);
+       REGISTER_CLASS_ENUM (SessionEvent, SetTrackSpeed);
        REGISTER_CLASS_ENUM (SessionEvent, Locate);
        REGISTER_CLASS_ENUM (SessionEvent, LocateRoll);
        REGISTER_CLASS_ENUM (SessionEvent, LocateRollLocate);
@@ -373,7 +374,7 @@ setup_enum_writer ()
 
        REGISTER_CLASS_ENUM (Route, Hidden);
        REGISTER_CLASS_ENUM (Route, MasterOut);
-       REGISTER_CLASS_ENUM (Route, ControlOut);
+       REGISTER_CLASS_ENUM (Route, MonitorOut);
        REGISTER_BITS (_Route_Flag);
 
        REGISTER_CLASS_ENUM (Source, Writable);
@@ -386,12 +387,12 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Source, Destructive);
        REGISTER_BITS (_Source_Flag);
 
-       REGISTER_CLASS_ENUM (AudioRegion, Linear);
-       REGISTER_CLASS_ENUM (AudioRegion, Fast);
-       REGISTER_CLASS_ENUM (AudioRegion, Slow);
-       REGISTER_CLASS_ENUM (AudioRegion, LogA);
-       REGISTER_CLASS_ENUM (AudioRegion, LogB);
-       REGISTER (_AudioRegion_FadeShape);
+       REGISTER_ENUM (FadeLinear);
+       REGISTER_ENUM (FadeFast);
+       REGISTER_ENUM (FadeSlow);
+       REGISTER_ENUM (FadeLogA);
+       REGISTER_ENUM (FadeLogB);
+       REGISTER (_FadeShape);
 
        REGISTER_CLASS_ENUM (Diskstream, Recordable);
        REGISTER_CLASS_ENUM (Diskstream, Hidden);
@@ -403,53 +404,14 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Location, IsAutoLoop);
        REGISTER_CLASS_ENUM (Location, IsHidden);
        REGISTER_CLASS_ENUM (Location, IsCDMarker);
-       REGISTER_CLASS_ENUM (Location, IsEnd);
+       REGISTER_CLASS_ENUM (Location, IsSessionRange);
        REGISTER_CLASS_ENUM (Location, IsRangeMarker);
-       REGISTER_CLASS_ENUM (Location, IsStart);
        REGISTER_BITS (_Location_Flags);
 
-       REGISTER_CLASS_ENUM (RouteGroup, Relative);
-       REGISTER_CLASS_ENUM (RouteGroup, Active);
-       REGISTER_CLASS_ENUM (RouteGroup, Hidden);
-       REGISTER_BITS (_RouteGroup_Flag);
-
-       REGISTER_CLASS_ENUM (RouteGroup, Gain);
-       REGISTER_CLASS_ENUM (RouteGroup, Mute);
-       REGISTER_CLASS_ENUM (RouteGroup, Solo);
-       REGISTER_CLASS_ENUM (RouteGroup, RecEnable);
-       REGISTER_CLASS_ENUM (RouteGroup, Select);
-       REGISTER_CLASS_ENUM (RouteGroup, Edit);
-       REGISTER_BITS (_RouteGroup_Property);
-
        REGISTER_CLASS_ENUM (Panner, SameDirection);
        REGISTER_CLASS_ENUM (Panner, OppositeDirection);
        REGISTER (_Panner_LinkDirection);
 
-       REGISTER_CLASS_ENUM (Region, Muted);
-       REGISTER_CLASS_ENUM (Region, Opaque);
-       REGISTER_CLASS_ENUM (Region, EnvelopeActive);
-       REGISTER_CLASS_ENUM (Region, DefaultFadeIn);
-       REGISTER_CLASS_ENUM (Region, DefaultFadeOut);
-       REGISTER_CLASS_ENUM (Region, Locked);
-       REGISTER_CLASS_ENUM (Region, PositionLocked);
-       REGISTER_CLASS_ENUM (Region, Automatic);
-       REGISTER_CLASS_ENUM (Region, WholeFile);
-       REGISTER_CLASS_ENUM (Region, FadeIn);
-       REGISTER_CLASS_ENUM (Region, FadeOut);
-       REGISTER_CLASS_ENUM (Region, Copied);
-       REGISTER_CLASS_ENUM (Region, Import);
-       REGISTER_CLASS_ENUM (Region, External);
-       REGISTER_CLASS_ENUM (Region, SyncMarked);
-       REGISTER_CLASS_ENUM (Region, LeftOfSplit);
-       REGISTER_CLASS_ENUM (Region, RightOfSplit);
-       REGISTER_CLASS_ENUM (Region, Hidden);
-       REGISTER_CLASS_ENUM (Region, DoNotSendPropertyChanges);
-       REGISTER_BITS (_Region_Flag);
-
-       REGISTER_CLASS_ENUM (Region, AudioTime);
-       REGISTER_CLASS_ENUM (Region, MusicTime);
-       REGISTER_BITS (_Region_PositionLockStyle);
-
        REGISTER_CLASS_ENUM (Track, NoFreeze);
        REGISTER_CLASS_ENUM (Track, Frozen);
        REGISTER_CLASS_ENUM (Track, UnFrozen);
@@ -583,6 +545,9 @@ setup_enum_writer ()
        REGISTER_ENUM(Groove);
        REGISTER(_QuantizeType);
 
+       REGISTER_ENUM(AudioTime);
+       REGISTER_ENUM(MusicTime);
+       REGISTER(_PositionLockStyle);
 }
 
 } /* namespace ARDOUR */
@@ -694,6 +659,20 @@ 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) 
+{ 
+       std::string s;
+       o >> s;
+       var = (InsertMergePolicy) 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;
@@ -799,4 +778,16 @@ std::ostream& operator<<(std::ostream& o, const WaveformShape& var)
        return o << s;
 }
 
+std::istream& operator>>(std::istream& o, PositionLockStyle& var) 
+{ 
+       std::string s;
+       o >> s;
+       var = (PositionLockStyle) string_2_enum (s, var);
+       return o;
+}
 
+std::ostream& operator<<(std::ostream& o, const PositionLockStyle& var) 
+{ 
+       std::string s = enum_2_string (var);
+       return o << s;
+}