Clear up confusion with overloads of _frozen and frozen()

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

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 6f3dff17a9d00648967b4ed859d191ea28c55995..1f75f5ab436dafef9676ea1578bce0f2a92ce28d 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -54,6 +54,7 @@ setup_enum_writer ()
 
        OverlapType _OverlapType;
        AlignStyle _AlignStyle;
+       AlignChoice _AlignChoice;
        MeterPoint _MeterPoint;
        TrackMode _TrackMode;
        NoteMode _NoteMode;
@@ -65,6 +66,10 @@ setup_enum_writer ()
        RegionPoint _RegionPoint;
        Placement _Placement;
        MonitorModel _MonitorModel;
+       MonitorChoice _MonitorChoice;
+       MonitorState _MonitorState;
+       PFLPosition _PFLPosition;
+       AFLPosition _AFLPosition;
        RemoteModel _RemoteModel;
        DenormalModel _DenormalModel;
        CrossfadeModel _CrossfadeModel;
@@ -83,7 +88,6 @@ setup_enum_writer ()
        TimecodeFormat _Session_TimecodeFormat;
        Session::PullupFormat _Session_PullupFormat;
        FadeShape _FadeShape;
-       Panner::LinkDirection _Panner_LinkDirection;
        IOChange _IOChange;
        AutomationType _AutomationType;
        AutoState _AutoState;
@@ -113,6 +117,8 @@ setup_enum_writer ()
        IO::Direction _IO_Direction;
        MuteMaster::MutePoint _MuteMaster_MutePoint;
        MidiModel::NoteDiffCommand::Property _MidiModel_NoteDiffCommand_Property;
+       MidiModel::SysExDiffCommand::Property _MidiModel_SysExDiffCommand_Property;
+       MidiModel::PatchChangeDiffCommand::Property _MidiModel_PatchChangeDiffCommand_Property;
        WaveformScale _WaveformScale;
        WaveformShape _WaveformShape;
        QuantizeType _QuantizeType;
@@ -133,7 +139,9 @@ setup_enum_writer ()
        REGISTER (_OverlapType);
 
        REGISTER_ENUM (GainAutomation);
-       REGISTER_ENUM (PanAutomation);
+       REGISTER_ENUM (PanAzimuthAutomation);
+       REGISTER_ENUM (PanElevationAutomation);
+       REGISTER_ENUM (PanWidthAutomation);
        REGISTER_ENUM (PluginAutomation);
        REGISTER_ENUM (SoloAutomation);
        REGISTER_ENUM (MuteAutomation);
@@ -157,9 +165,15 @@ setup_enum_writer ()
        REGISTER_ENUM (ExistingMaterial);
        REGISTER (_AlignStyle);
 
+       REGISTER_ENUM (UseCaptureTime);
+       REGISTER_ENUM (UseExistingMaterial);
+       REGISTER_ENUM (Automatic);
+       REGISTER (_AlignChoice);
+
        REGISTER_ENUM (MeterInput);
        REGISTER_ENUM (MeterPreFader);
        REGISTER_ENUM (MeterPostFader);
+       REGISTER_ENUM (MeterOutput);
        REGISTER_ENUM (MeterCustom);
        REGISTER (_MeterPoint);
 
@@ -199,6 +213,7 @@ setup_enum_writer ()
 
        REGISTER_ENUM (Slide);
        REGISTER_ENUM (Splice);
+       REGISTER_ENUM (Lock);
        REGISTER (_EditMode);
 
        REGISTER_ENUM (Start);
@@ -215,6 +230,25 @@ setup_enum_writer ()
        REGISTER_ENUM (ExternalMonitoring);
        REGISTER (_MonitorModel);
 
+       REGISTER_ENUM (MonitorInput);
+       REGISTER_ENUM (MonitorDisk);
+       REGISTER_ENUM (MonitorAuto);
+       REGISTER_ENUM (MonitorCue);
+       REGISTER_BITS (_MonitorChoice);
+
+       REGISTER_ENUM (MonitoringInput);
+       REGISTER_ENUM (MonitoringDisk);
+       REGISTER_ENUM (MonitoringSilence);
+       REGISTER_BITS (_MonitorState);
+
+       REGISTER_ENUM (PFLFromBeforeProcessors);
+       REGISTER_ENUM (PFLFromAfterProcessors);
+       REGISTER (_PFLPosition);
+
+       REGISTER_ENUM (AFLFromBeforeProcessors);
+       REGISTER_ENUM (AFLFromAfterProcessors);
+       REGISTER (_AFLPosition);
+
        REGISTER_ENUM (DenormalNone);
        REGISTER_ENUM (DenormalFTZ);
        REGISTER_ENUM (DenormalDAZ);
@@ -234,7 +268,7 @@ setup_enum_writer ()
        REGISTER_ENUM (MoveAddHigher);
        REGISTER_ENUM (AddHigher);
        REGISTER (_LayerModel);
-        
+
         REGISTER_ENUM (InsertMergeReject);
         REGISTER_ENUM (InsertMergeRelax);
         REGISTER_ENUM (InsertMergeReplace);
@@ -272,7 +306,8 @@ setup_enum_writer ()
 
        REGISTER_ENUM (AudioUnit);
        REGISTER_ENUM (LADSPA);
-       REGISTER_ENUM (VST);
+       REGISTER_ENUM (Windows_VST);
+       REGISTER_ENUM (LXVST);
        REGISTER (_PluginType);
 
        REGISTER_ENUM (MTC);
@@ -323,9 +358,6 @@ setup_enum_writer ()
        REGISTER (_MIDI_MTC_Status);
 
        REGISTER_CLASS_ENUM (Session, PostTransportStop);
-       REGISTER_CLASS_ENUM (Session, PostTransportDisableRecord);
-       REGISTER_CLASS_ENUM (Session, PostTransportPosition);
-       REGISTER_CLASS_ENUM (Session, PostTransportDidRecord);
        REGISTER_CLASS_ENUM (Session, PostTransportDuration);
        REGISTER_CLASS_ENUM (Session, PostTransportLocate);
        REGISTER_CLASS_ENUM (Session, PostTransportRoll);
@@ -333,7 +365,6 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Session, PostTransportOverWrite);
        REGISTER_CLASS_ENUM (Session, PostTransportSpeed);
        REGISTER_CLASS_ENUM (Session, PostTransportAudition);
-       REGISTER_CLASS_ENUM (Session, PostTransportScrub);
        REGISTER_CLASS_ENUM (Session, PostTransportReverse);
        REGISTER_CLASS_ENUM (Session, PostTransportInputChange);
        REGISTER_CLASS_ENUM (Session, PostTransportCurveRealloc);
@@ -408,10 +439,6 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Location, IsRangeMarker);
        REGISTER_BITS (_Location_Flags);
 
-       REGISTER_CLASS_ENUM (Panner, SameDirection);
-       REGISTER_CLASS_ENUM (Panner, OppositeDirection);
-       REGISTER (_Panner_LinkDirection);
-
        REGISTER_CLASS_ENUM (Track, NoFreeze);
        REGISTER_CLASS_ENUM (Track, Frozen);
        REGISTER_CLASS_ENUM (Track, UnFrozen);
@@ -486,6 +513,7 @@ setup_enum_writer ()
        REGISTER (_ExportFormatBase_Quality);
 
        REGISTER_CLASS_ENUM (ExportFormatBase, SR_None);
+       REGISTER_CLASS_ENUM (ExportFormatBase, SR_Session);
        REGISTER_CLASS_ENUM (ExportFormatBase, SR_22_05);
        REGISTER_CLASS_ENUM (ExportFormatBase, SR_44_1);
        REGISTER_CLASS_ENUM (ExportFormatBase, SR_48);
@@ -505,7 +533,6 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (ExportProfileManager, BBT);
        REGISTER_CLASS_ENUM (ExportProfileManager, MinSec);
        REGISTER_CLASS_ENUM (ExportProfileManager, Frames);
-       REGISTER_CLASS_ENUM (ExportProfileManager, Off);
        REGISTER (_ExportProfileManager_TimeFormat);
 
        REGISTER_CLASS_ENUM (Delivery, Insert);
@@ -532,6 +559,14 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (MidiModel::NoteDiffCommand, Length);
        REGISTER (_MidiModel_NoteDiffCommand_Property);
 
+       REGISTER_CLASS_ENUM (MidiModel::SysExDiffCommand, Time);
+       REGISTER (_MidiModel_SysExDiffCommand_Property);
+
+       REGISTER_CLASS_ENUM (MidiModel::PatchChangeDiffCommand, Time);
+       REGISTER_CLASS_ENUM (MidiModel::PatchChangeDiffCommand, Program);
+       REGISTER_CLASS_ENUM (MidiModel::PatchChangeDiffCommand, Bank);
+       REGISTER (_MidiModel_PatchChangeDiffCommand_Property);
+
        REGISTER_ENUM(Linear);
        REGISTER_ENUM(Logarithmic);
        REGISTER(_WaveformScale);
@@ -554,60 +589,90 @@ setup_enum_writer ()
 
 /* deserializing types from ardour/types.h */
 
-std::istream& operator>>(std::istream& o, HeaderFormat& var) 
-{ 
+std::istream& operator>>(std::istream& o, HeaderFormat& var)
+{
        std::string s;
        o >> s;
        var = (HeaderFormat) string_2_enum (s, var);
        return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const HeaderFormat& var) 
-{ 
+std::ostream& operator<<(std::ostream& o, const HeaderFormat& var)
+{
        std::string s = enum_2_string (var);
        return o << s;
 }
 
-std::istream& operator>>(std::istream& o, SampleFormat& var) 
-{ 
+std::istream& operator>>(std::istream& o, SampleFormat& var)
+{
        std::string s;
        o >> s;
        var = (SampleFormat) string_2_enum (s, var);
        return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const SampleFormat& var) 
-{ 
+std::ostream& operator<<(std::ostream& o, const SampleFormat& var)
+{
        std::string s = enum_2_string (var);
        return o << s;
 }
-std::istream& operator>>(std::istream& o, AutoConnectOption& var) 
-{ 
+std::istream& operator>>(std::istream& o, AutoConnectOption& var)
+{
        std::string s;
        o >> s;
        var = (AutoConnectOption) string_2_enum (s, var);
        return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const AutoConnectOption& var) 
-{ 
+std::ostream& operator<<(std::ostream& o, const AutoConnectOption& var)
+{
        std::string s = enum_2_string (var);
        return o << s;
 }
-std::istream& operator>>(std::istream& o, MonitorModel& var) 
-{ 
+
+std::istream& operator>>(std::istream& o, MonitorModel& var)
+{
        std::string s;
        o >> s;
        var = (MonitorModel) string_2_enum (s, var);
        return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const MonitorModel& var) 
-{ 
+std::ostream& operator<<(std::ostream& o, const MonitorModel& var)
+{
        std::string s = enum_2_string (var);
        return o << s;
 }
-std::istream& operator>>(std::istream& o, RemoteModel& var) 
+
+std::istream& operator>>(std::istream& o, PFLPosition& var)
+{
+       std::string s;
+       o >> s;
+       var = (PFLPosition) string_2_enum (s, var);
+       return o;
+}
+
+std::ostream& operator<<(std::ostream& o, const PFLPosition& var)
+{
+       std::string s = enum_2_string (var);
+       return o << s;
+}
+
+std::istream& operator>>(std::istream& o, AFLPosition& var)
+{
+       std::string s;
+       o >> s;
+       var = (AFLPosition) string_2_enum (s, var);
+       return o;
+}
+
+std::ostream& operator<<(std::ostream& o, const AFLPosition& var)
+{
+       std::string s = enum_2_string (var);
+       return o << s;
+}
+
+std::istream& operator>>(std::istream& o, RemoteModel& var)
 {
        std::string s;
        o >> s;
@@ -615,179 +680,179 @@ std::istream& operator>>(std::istream& o, RemoteModel& var)
        return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const RemoteModel& var) 
+std::ostream& operator<<(std::ostream& o, const RemoteModel& var)
 {
        std::string s = enum_2_string (var);
        return o << s;
 }
-std::istream& operator>>(std::istream& o, EditMode& var) 
-{ 
+std::istream& operator>>(std::istream& o, EditMode& var)
+{
        std::string s;
        o >> s;
        var = (EditMode) string_2_enum (s, var);
        return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const EditMode& var) 
-{ 
+std::ostream& operator<<(std::ostream& o, const EditMode& var)
+{
        std::string s = enum_2_string (var);
        return o << s;
 }
-std::istream& operator>>(std::istream& o, ListenPosition& var) 
-{ 
+std::istream& operator>>(std::istream& o, ListenPosition& var)
+{
        std::string s;
        o >> s;
        var = (ListenPosition) string_2_enum (s, var);
        return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const ListenPosition& var) 
-{ 
+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::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::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::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::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::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 CrossfadeModel& var)
+{
        std::string s = enum_2_string (var);
        return o << s;
 }
-std::istream& operator>>(std::istream& o, SyncSource& var) 
-{ 
+std::istream& operator>>(std::istream& o, SyncSource& var)
+{
        std::string s;
        o >> s;
        var = (SyncSource) string_2_enum (s, var);
        return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const SyncSource& var) 
-{ 
+std::ostream& operator<<(std::ostream& o, const SyncSource& var)
+{
        std::string s = enum_2_string (var);
        return o << s;
 }
-std::istream& operator>>(std::istream& o, ShuttleBehaviour& var) 
-{ 
+std::istream& operator>>(std::istream& o, ShuttleBehaviour& var)
+{
        std::string s;
        o >> s;
        var = (ShuttleBehaviour) string_2_enum (s, var);
        return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const ShuttleBehaviour& var) 
-{ 
+std::ostream& operator<<(std::ostream& o, const ShuttleBehaviour& var)
+{
        std::string s = enum_2_string (var);
        return o << s;
 }
-std::istream& operator>>(std::istream& o, ShuttleUnits& var) 
-{ 
+std::istream& operator>>(std::istream& o, ShuttleUnits& var)
+{
        std::string s;
        o >> s;
        var = (ShuttleUnits) string_2_enum (s, var);
        return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const ShuttleUnits& var) 
-{ 
+std::ostream& operator<<(std::ostream& o, const ShuttleUnits& var)
+{
        std::string s = enum_2_string (var);
        return o << s;
 }
-std::istream& operator>>(std::istream& o, TimecodeFormat& var) 
-{ 
+std::istream& operator>>(std::istream& o, TimecodeFormat& var)
+{
        std::string s;
        o >> s;
        var = (TimecodeFormat) string_2_enum (s, var);
        return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const TimecodeFormat& var) 
-{ 
+std::ostream& operator<<(std::ostream& o, const TimecodeFormat& var)
+{
        std::string s = enum_2_string (var);
        return o << s;
 }
-std::istream& operator>>(std::istream& o, DenormalModel& var) 
-{ 
+std::istream& operator>>(std::istream& o, DenormalModel& var)
+{
        std::string s;
        o >> s;
        var = (DenormalModel) string_2_enum (s, var);
        return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const DenormalModel& var) 
-{ 
+std::ostream& operator<<(std::ostream& o, const DenormalModel& var)
+{
        std::string s = enum_2_string (var);
        return o << s;
 }
-std::istream& operator>>(std::istream& o, WaveformScale& var) 
-{ 
+std::istream& operator>>(std::istream& o, WaveformScale& var)
+{
        std::string s;
        o >> s;
        var = (WaveformScale) string_2_enum (s, var);
        return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const WaveformScale& var) 
-{ 
+std::ostream& operator<<(std::ostream& o, const WaveformScale& var)
+{
        std::string s = enum_2_string (var);
        return o << s;
 }
-std::istream& operator>>(std::istream& o, WaveformShape& var) 
-{ 
+std::istream& operator>>(std::istream& o, WaveformShape& var)
+{
        std::string s;
        o >> s;
        var = (WaveformShape) string_2_enum (s, var);
        return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const WaveformShape& var) 
-{ 
+std::ostream& operator<<(std::ostream& o, const WaveformShape& var)
+{
        std::string s = enum_2_string (var);
        return o << s;
 }
 
-std::istream& operator>>(std::istream& o, PositionLockStyle& var) 
-{ 
+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::ostream& operator<<(std::ostream& o, const PositionLockStyle& var)
+{
        std::string s = enum_2_string (var);
        return o << s;
 }