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 972ff2efb7ca05d55708f2b801fe87ed8dbc3f48..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,6 +66,8 @@ setup_enum_writer ()
        RegionPoint _RegionPoint;
        Placement _Placement;
        MonitorModel _MonitorModel;
+       PFLPosition _PFLPosition;
+       AFLPosition _AFLPosition;
        RemoteModel _RemoteModel;
        DenormalModel _DenormalModel;
        CrossfadeModel _CrossfadeModel;
@@ -82,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;
@@ -112,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;
@@ -133,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);
@@ -157,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);
 
@@ -199,6 +211,7 @@ setup_enum_writer ()
 
        REGISTER_ENUM (Slide);
        REGISTER_ENUM (Splice);
+       REGISTER_ENUM (Lock);
        REGISTER (_EditMode);
 
        REGISTER_ENUM (Start);
@@ -215,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);
@@ -387,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);
@@ -408,10 +429,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 +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);
@@ -525,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);
@@ -594,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;
@@ -607,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;