Sort various things to reduce merge hell. No functional changes.

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

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 345fbe771dbe8b4daaae55003d4da98243bd7ddf..d64d3a2f9966136f26bf0f0e3abca2818431157f 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -28,6 +28,7 @@
 #include <ardour/route_group.h>
 #include <ardour/panner.h>
 #include <ardour/track.h>
+#include <ardour/midi_track.h>
 
 using namespace std;
 using namespace PBD;
@@ -44,6 +45,7 @@ setup_enum_writer ()
        AlignStyle _AlignStyle;
        MeterPoint _MeterPoint;
        TrackMode _TrackMode;
+       NoteMode _NoteMode;
        MeterFalloff _MeterFalloff;
        MeterHold _MeterHold;
        EditMode _EditMode;
@@ -51,6 +53,7 @@ setup_enum_writer ()
        Placement _Placement;
        MonitorModel _MonitorModel;
        RemoteModel _RemoteModel;
+       DenormalModel _DenormalModel;
        CrossfadeModel _CrossfadeModel;
        LayerModel _LayerModel;
        SoloModel _SoloModel;
@@ -79,7 +82,9 @@ setup_enum_writer ()
        Location::Flags _Location_Flags;
        RouteGroup::Flag _RouteGroup_Flag;
        Region::Flag _Region_Flag;
+       Region::PositionLockStyle _Region_PositionLockStyle;
        Track::FreezeState _Track_FreezeState;
+       AutomationList::InterpolationStyle _AutomationList_InterpolationStyle;
 
 #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()
@@ -103,6 +108,10 @@ setup_enum_writer ()
        REGISTER_ENUM (PluginAutomation);
        REGISTER_ENUM (SoloAutomation);
        REGISTER_ENUM (MuteAutomation);
+       REGISTER_ENUM (MidiCCAutomation);
+       REGISTER_ENUM (FadeInAutomation);
+       REGISTER_ENUM (FadeOutAutomation);
+       REGISTER_ENUM (EnvelopeAutomation);
        REGISTER_BITS (_AutomationType);
 
        REGISTER_ENUM (Off);
@@ -127,6 +136,10 @@ setup_enum_writer ()
        REGISTER_ENUM (Normal);
        REGISTER_ENUM (Destructive);
        REGISTER (_TrackMode);
+       
+       REGISTER_ENUM (Sustained);
+       REGISTER_ENUM (Percussive);
+       REGISTER (_NoteMode);
 
        REGISTER_ENUM (MeterFalloffOff);
        REGISTER_ENUM (MeterFalloffSlowest);
@@ -152,7 +165,6 @@ setup_enum_writer ()
        REGISTER_ENUM (SyncPoint);      
        REGISTER (_RegionPoint);
 
-
        REGISTER_ENUM (PreFader);
        REGISTER_ENUM (PostFader);
        REGISTER (_Placement);
@@ -162,6 +174,12 @@ setup_enum_writer ()
        REGISTER_ENUM (ExternalMonitoring);
        REGISTER (_MonitorModel);
 
+       REGISTER_ENUM (DenormalNone);
+       REGISTER_ENUM (DenormalFTZ);
+       REGISTER_ENUM (DenormalDAZ);
+       REGISTER_ENUM (DenormalFTZDAZ);
+       REGISTER (_DenormalModel);
+
        REGISTER_ENUM (UserOrdered);
        REGISTER_ENUM (MixerOrdered);
        REGISTER_ENUM (EditorOrdered);
@@ -186,6 +204,7 @@ setup_enum_writer ()
 
        REGISTER_ENUM (FormatFloat);
        REGISTER_ENUM (FormatInt24);
+       REGISTER_ENUM (FormatInt16);
        REGISTER (_SampleFormat);
 
        REGISTER_ENUM (BWF);
@@ -224,6 +243,7 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Session::Event, SetDiskstreamSpeed);
        REGISTER_CLASS_ENUM (Session::Event, Locate);
        REGISTER_CLASS_ENUM (Session::Event, LocateRoll);
+       REGISTER_CLASS_ENUM (Session::Event, LocateRollLocate);
        REGISTER_CLASS_ENUM (Session::Event, SetLoop);
        REGISTER_CLASS_ENUM (Session::Event, PunchIn);
        REGISTER_CLASS_ENUM (Session::Event, PunchOut);
@@ -330,6 +350,7 @@ setup_enum_writer ()
        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);
@@ -344,9 +365,18 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Region, DoNotSaveState);
        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);
        REGISTER (_Track_FreezeState);
        
+       REGISTER_CLASS_ENUM (AutomationList, Discrete);
+       REGISTER_CLASS_ENUM (AutomationList, Linear);
+       REGISTER_CLASS_ENUM (AutomationList, Curved);
+       REGISTER (_AutomationList_InterpolationStyle);
+       
 }