make instruments/generators do the right thing when bypassed

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

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index baf8f7326d914456ddfdf0282b2282403cea7fd6..878da1e381bf14345b38f4bbadf99c1671089b57 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,10 +66,13 @@ setup_enum_writer ()
        RegionPoint _RegionPoint;
        Placement _Placement;
        MonitorModel _MonitorModel;
+       PFLPosition _PFLPosition;
+       AFLPosition _AFLPosition;
        RemoteModel _RemoteModel;
        DenormalModel _DenormalModel;
        CrossfadeModel _CrossfadeModel;
        LayerModel _LayerModel;
+       InsertMergePolicy _InsertMergePolicy;
        ListenPosition _ListenPosition;
        SampleFormat _SampleFormat;
        CDMarkerFormat _CDMarkerFormat;
@@ -81,8 +85,7 @@ setup_enum_writer ()
        SessionEvent::Type _SessionEvent_Type;
        TimecodeFormat _Session_TimecodeFormat;
        Session::PullupFormat _Session_PullupFormat;
-       AudioRegion::FadeShape _AudioRegion_FadeShape;
-       Panner::LinkDirection _Panner_LinkDirection;
+       FadeShape _FadeShape;
        IOChange _IOChange;
        AutomationType _AutomationType;
        AutoState _AutoState;
@@ -93,7 +96,7 @@ setup_enum_writer ()
        Source::Flag _Source_Flag;
        Diskstream::Flag _Diskstream_Flag;
        Location::Flags _Location_Flags;
-       Region::PositionLockStyle _Region_PositionLockStyle;
+       PositionLockStyle _PositionLockStyle;
        Track::FreezeState _Track_FreezeState;
        AutomationList::InterpolationStyle _AutomationList_InterpolationStyle;
        AnyTime::Type _AnyTime_Type;
@@ -111,7 +114,9 @@ setup_enum_writer ()
        Delivery::Role _Delivery_Role;
        IO::Direction _IO_Direction;
        MuteMaster::MutePoint _MuteMaster_MutePoint;
-       MidiModel::DiffCommand::Property _MidiModel_DiffCommand_Property;
+       MidiModel::NoteDiffCommand::Property _MidiModel_NoteDiffCommand_Property;
+       MidiModel::SysExDiffCommand::Property _MidiModel_SysExDiffCommand_Property;
+       MidiModel::PatchChangeDiffCommand::Property _MidiModel_PatchChangeDiffCommand_Property;
        WaveformScale _WaveformScale;
        WaveformShape _WaveformShape;
        QuantizeType _QuantizeType;
@@ -124,11 +129,6 @@ setup_enum_writer ()
 #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);
@@ -137,7 +137,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);
@@ -161,9 +163,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);
 
@@ -203,6 +211,7 @@ setup_enum_writer ()
 
        REGISTER_ENUM (Slide);
        REGISTER_ENUM (Splice);
+       REGISTER_ENUM (Lock);
        REGISTER (_EditMode);
 
        REGISTER_ENUM (Start);
@@ -219,6 +228,14 @@ setup_enum_writer ()
        REGISTER_ENUM (ExternalMonitoring);
        REGISTER (_MonitorModel);
 
+       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);
@@ -238,6 +255,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);
@@ -290,7 +315,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);
@@ -370,7 +395,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);
@@ -383,12 +408,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);
@@ -400,19 +425,10 @@ 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 (Panner, SameDirection);
-       REGISTER_CLASS_ENUM (Panner, OppositeDirection);
-       REGISTER (_Panner_LinkDirection);
-
-       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);
@@ -487,6 +503,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);
@@ -526,13 +543,21 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (IO, Output);
        REGISTER (_IO_Direction);
 
-       REGISTER_CLASS_ENUM (MidiModel::DiffCommand, NoteNumber);
-       REGISTER_CLASS_ENUM (MidiModel::DiffCommand, Channel);
-       REGISTER_CLASS_ENUM (MidiModel::DiffCommand, Velocity);
-       REGISTER_CLASS_ENUM (MidiModel::DiffCommand, StartTime);
-       REGISTER_CLASS_ENUM (MidiModel::DiffCommand, Length);
-       REGISTER (_MidiModel_DiffCommand_Property);
-
+       REGISTER_CLASS_ENUM (MidiModel::NoteDiffCommand, NoteNumber);
+       REGISTER_CLASS_ENUM (MidiModel::NoteDiffCommand, Channel);
+       REGISTER_CLASS_ENUM (MidiModel::NoteDiffCommand, Velocity);
+       REGISTER_CLASS_ENUM (MidiModel::NoteDiffCommand, StartTime);
+       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);
@@ -545,6 +570,10 @@ setup_enum_writer ()
        REGISTER_ENUM(Legato);
        REGISTER_ENUM(Groove);
        REGISTER(_QuantizeType);
+
+       REGISTER_ENUM(AudioTime);
+       REGISTER_ENUM(MusicTime);
+       REGISTER(_PositionLockStyle);
 }
 
 } /* namespace ARDOUR */
@@ -591,6 +620,7 @@ 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::string s;
@@ -604,6 +634,35 @@ 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, 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;
@@ -656,6 +715,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;
@@ -761,4 +834,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;
+}