if a request to reset the speed to zero as the default arrives when stopped, reset...
[ardour.git] / libs / ardour / enums.cc
index efe72ddb4bea4167c0e4340fb3e542b89bb4f078..961041c2da2e99b70d66039a840a1d759a43ba4c 100644 (file)
 */
 
 #include "pbd/enumwriter.h"
+#include "midi++/types.h"
+
+#include "evoral/Range.hpp" // shouldn't Evoral have its own enum registration?
 
-#include "ardour/audiofilesource.h"
-#include "ardour/audioregion.h"
 #include "ardour/delivery.h"
 #include "ardour/diskstream.h"
+#include "ardour/export_channel.h"
 #include "ardour/export_filename.h"
 #include "ardour/export_format_base.h"
 #include "ardour/export_profile_manager.h"
 #include "ardour/io.h"
 #include "ardour/location.h"
-#include "ardour/midi_track.h"
+#include "ardour/midi_model.h"
 #include "ardour/mute_master.h"
-#include "ardour/panner.h"
-#include "ardour/route_group.h"
 #include "ardour/session.h"
+#include "ardour/source.h"
 #include "ardour/track.h"
 #include "ardour/types.h"
 
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace MIDI;
+
+namespace ARDOUR {
 
 void
 setup_enum_writer ()
 {
-       EnumWriter* enum_writer = new EnumWriter();
+       EnumWriter& enum_writer (EnumWriter::instance());
        vector<int> i;
        vector<string> s;
 
-       OverlapType _OverlapType;
        AlignStyle _AlignStyle;
+       AlignChoice _AlignChoice;
        MeterPoint _MeterPoint;
        TrackMode _TrackMode;
        NoteMode _NoteMode;
@@ -60,38 +64,40 @@ setup_enum_writer ()
        RegionPoint _RegionPoint;
        Placement _Placement;
        MonitorModel _MonitorModel;
+       MonitorChoice _MonitorChoice;
+       MonitorState _MonitorState;
+       PFLPosition _PFLPosition;
+       AFLPosition _AFLPosition;
        RemoteModel _RemoteModel;
        DenormalModel _DenormalModel;
        CrossfadeModel _CrossfadeModel;
-       LayerModel _LayerModel;
+       CrossfadeChoice _CrossfadeChoice;
+       InsertMergePolicy _InsertMergePolicy;
        ListenPosition _ListenPosition;
        SampleFormat _SampleFormat;
        CDMarkerFormat _CDMarkerFormat;
        HeaderFormat _HeaderFormat;
        PluginType _PluginType;
-       SlaveSource _SlaveSource;
+       SyncSource _SyncSource;
        ShuttleBehaviour _ShuttleBehaviour;
        ShuttleUnits _ShuttleUnits;
        Session::RecordState _Session_RecordState;
-       Session::Event::Type _Session_Event_Type;
-       SmpteFormat _Session_SmpteFormat;
+       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;
        AutoStyle _AutoStyle;
        AutoConnectOption _AutoConnectOption;
+       RouteSortOrderKey _RouteSortOrderKey;
        Session::StateOfTheState _Session_StateOfTheState;
        Route::Flag _Route_Flag;
        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;
@@ -106,29 +112,29 @@ setup_enum_writer ()
        ExportFormatBase::SampleRate _ExportFormatBase_SampleRate;
        ExportFormatBase::SRCQuality _ExportFormatBase_SRCQuality;
        ExportProfileManager::TimeFormat _ExportProfileManager_TimeFormat;
+       RegionExportChannelFactory::Type _RegionExportChannelFactory_Type;
        Delivery::Role _Delivery_Role;
        IO::Direction _IO_Direction;
        MuteMaster::MutePoint _MuteMaster_MutePoint;
-
-#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()
+       MidiModel::NoteDiffCommand::Property _MidiModel_NoteDiffCommand_Property;
+       MidiModel::SysExDiffCommand::Property _MidiModel_SysExDiffCommand_Property;
+       MidiModel::PatchChangeDiffCommand::Property _MidiModel_PatchChangeDiffCommand_Property;
+       WaveformScale _WaveformScale;
+       WaveformShape _WaveformShape;
+       Session::PostTransportWork _Session_PostTransportWork;
+       Session::SlaveState _Session_SlaveState;
+       MTC_Status _MIDI_MTC_Status;
+       Evoral::OverlapType _OverlapType;
+
+#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);
-       REGISTER_ENUM (OverlapEnd);
-       REGISTER_ENUM (OverlapExternal);
-       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);
@@ -152,9 +158,16 @@ 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);
 
        REGISTER_ENUM (Normal);
@@ -175,7 +188,7 @@ setup_enum_writer ()
        REGISTER_ENUM (ChannelColors);
        REGISTER_ENUM (TrackColor);
        REGISTER (_ColorMode);
-       
+
        REGISTER_ENUM (MeterFalloffOff);
        REGISTER_ENUM (MeterFalloffSlowest);
        REGISTER_ENUM (MeterFalloffSlow);
@@ -193,6 +206,7 @@ setup_enum_writer ()
 
        REGISTER_ENUM (Slide);
        REGISTER_ENUM (Splice);
+       REGISTER_ENUM (Lock);
        REGISTER (_EditMode);
 
        REGISTER_ENUM (Start);
@@ -209,6 +223,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);
@@ -224,10 +257,18 @@ setup_enum_writer ()
        REGISTER_ENUM (ShortCrossfade);
        REGISTER (_CrossfadeModel);
 
-       REGISTER_ENUM (LaterHigher);
-       REGISTER_ENUM (MoveAddHigher);
-       REGISTER_ENUM (AddHigher);
-       REGISTER (_LayerModel);
+       REGISTER_ENUM (RegionFades);
+       REGISTER_ENUM (ConstantPowerMinus3dB);
+       REGISTER_ENUM (ConstantPowerMinus6dB);
+       REGISTER (_CrossfadeChoice);
+
+        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);
@@ -258,14 +299,14 @@ setup_enum_writer ()
 
        REGISTER_ENUM (AudioUnit);
        REGISTER_ENUM (LADSPA);
-       REGISTER_ENUM (VST);
+       REGISTER_ENUM (Windows_VST);
+       REGISTER_ENUM (LXVST);
        REGISTER (_PluginType);
 
-       REGISTER_ENUM (None);
        REGISTER_ENUM (MTC);
        REGISTER_ENUM (JACK);
        REGISTER_ENUM (MIDIClock);
-       REGISTER (_SlaveSource);
+       REGISTER (_SyncSource);
 
        REGISTER_ENUM (Sprung);
        REGISTER_ENUM (Wheel);
@@ -280,25 +321,48 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Session, Recording);
        REGISTER (_Session_RecordState);
 
-       REGISTER_CLASS_ENUM (Session::Event, SetTransportSpeed);
-       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);
-       REGISTER_CLASS_ENUM (Session::Event, RangeStop);
-       REGISTER_CLASS_ENUM (Session::Event, RangeLocate);
-       REGISTER_CLASS_ENUM (Session::Event, Overwrite);
-       REGISTER_CLASS_ENUM (Session::Event, SetSlaveSource);
-       REGISTER_CLASS_ENUM (Session::Event, Audition);
-       REGISTER_CLASS_ENUM (Session::Event, InputConfigurationChange);
-       REGISTER_CLASS_ENUM (Session::Event, SetAudioRange);
-       REGISTER_CLASS_ENUM (Session::Event, SetPlayRange);
-       REGISTER_CLASS_ENUM (Session::Event, StopOnce);
-       REGISTER_CLASS_ENUM (Session::Event, AutoLoop);
-       REGISTER (_Session_Event_Type);
+       REGISTER_CLASS_ENUM (SessionEvent, SetTransportSpeed);
+       REGISTER_CLASS_ENUM (SessionEvent, SetTrackSpeed);
+       REGISTER_CLASS_ENUM (SessionEvent, Locate);
+       REGISTER_CLASS_ENUM (SessionEvent, LocateRoll);
+       REGISTER_CLASS_ENUM (SessionEvent, LocateRollLocate);
+       REGISTER_CLASS_ENUM (SessionEvent, SetLoop);
+       REGISTER_CLASS_ENUM (SessionEvent, PunchIn);
+       REGISTER_CLASS_ENUM (SessionEvent, PunchOut);
+       REGISTER_CLASS_ENUM (SessionEvent, RangeStop);
+       REGISTER_CLASS_ENUM (SessionEvent, RangeLocate);
+       REGISTER_CLASS_ENUM (SessionEvent, Overwrite);
+       REGISTER_CLASS_ENUM (SessionEvent, SetSyncSource);
+       REGISTER_CLASS_ENUM (SessionEvent, Audition);
+       REGISTER_CLASS_ENUM (SessionEvent, InputConfigurationChange);
+       REGISTER_CLASS_ENUM (SessionEvent, SetPlayAudioRange);
+       REGISTER_CLASS_ENUM (SessionEvent, StopOnce);
+       REGISTER_CLASS_ENUM (SessionEvent, AutoLoop);
+       REGISTER (_SessionEvent_Type);
+
+       REGISTER_CLASS_ENUM (Session, Stopped);
+       REGISTER_CLASS_ENUM (Session, Waiting);
+       REGISTER_CLASS_ENUM (Session, Running);
+       REGISTER (_Session_SlaveState);
+
+       REGISTER_ENUM (MTC_Stopped);
+       REGISTER_ENUM (MTC_Forward);
+       REGISTER_ENUM (MTC_Backward);
+       REGISTER (_MIDI_MTC_Status);
+
+       REGISTER_CLASS_ENUM (Session, PostTransportStop);
+       REGISTER_CLASS_ENUM (Session, PostTransportDuration);
+       REGISTER_CLASS_ENUM (Session, PostTransportLocate);
+       REGISTER_CLASS_ENUM (Session, PostTransportRoll);
+       REGISTER_CLASS_ENUM (Session, PostTransportAbort);
+       REGISTER_CLASS_ENUM (Session, PostTransportOverWrite);
+       REGISTER_CLASS_ENUM (Session, PostTransportSpeed);
+       REGISTER_CLASS_ENUM (Session, PostTransportAudition);
+       REGISTER_CLASS_ENUM (Session, PostTransportReverse);
+       REGISTER_CLASS_ENUM (Session, PostTransportInputChange);
+       REGISTER_CLASS_ENUM (Session, PostTransportCurveRealloc);
+       REGISTER_CLASS_ENUM (Session, PostTransportClearSubstate);
+       REGISTER_BITS (_Session_PostTransportWork);
 
        REGISTER_CLASS_ENUM (Session, Clean);
        REGISTER_CLASS_ENUM (Session, Dirty);
@@ -309,17 +373,17 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Session, InCleanup);
        REGISTER_BITS (_Session_StateOfTheState);
 
-       REGISTER_ENUM (smpte_23976);
-       REGISTER_ENUM (smpte_24);
-       REGISTER_ENUM (smpte_24976);
-       REGISTER_ENUM (smpte_25);
-       REGISTER_ENUM (smpte_2997);
-       REGISTER_ENUM (smpte_2997drop);
-       REGISTER_ENUM (smpte_30);
-       REGISTER_ENUM (smpte_30drop);
-       REGISTER_ENUM (smpte_5994);
-       REGISTER_ENUM (smpte_60);
-       REGISTER (_Session_SmpteFormat);
+       REGISTER_ENUM (timecode_23976);
+       REGISTER_ENUM (timecode_24);
+       REGISTER_ENUM (timecode_24976);
+       REGISTER_ENUM (timecode_25);
+       REGISTER_ENUM (timecode_2997);
+       REGISTER_ENUM (timecode_2997drop);
+       REGISTER_ENUM (timecode_30);
+       REGISTER_ENUM (timecode_30drop);
+       REGISTER_ENUM (timecode_5994);
+       REGISTER_ENUM (timecode_60);
+       REGISTER (_Session_TimecodeFormat);
 
        REGISTER_CLASS_ENUM (Session, pullup_Plus4Plus1);
        REGISTER_CLASS_ENUM (Session, pullup_Plus4);
@@ -334,9 +398,13 @@ 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_ENUM (MixerSort);
+       REGISTER_ENUM (EditorSort);
+       REGISTER (_RouteSortOrderKey);
+
        REGISTER_CLASS_ENUM (Source, Writable);
        REGISTER_CLASS_ENUM (Source, CanRename);
        REGISTER_CLASS_ENUM (Source, Broadcast);
@@ -347,12 +415,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 (FadeConstantPower);
+       REGISTER_ENUM (FadeSymmetric);
+       REGISTER (_FadeShape);
 
        REGISTER_CLASS_ENUM (Diskstream, Recordable);
        REGISTER_CLASS_ENUM (Diskstream, Hidden);
@@ -364,53 +432,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 (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);
@@ -421,7 +446,7 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (AutomationList, Curved);
        REGISTER (_AutomationList_InterpolationStyle);
 
-       REGISTER_CLASS_ENUM (AnyTime, SMPTE);
+       REGISTER_CLASS_ENUM (AnyTime, Timecode);
        REGISTER_CLASS_ENUM (AnyTime, BBT);
        REGISTER_CLASS_ENUM (AnyTime, Frames);
        REGISTER_CLASS_ENUM (AnyTime, Seconds);
@@ -485,6 +510,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);
@@ -500,17 +526,23 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (ExportFormatBase, SRC_Linear);
        REGISTER (_ExportFormatBase_SRCQuality);
 
-       REGISTER_CLASS_ENUM (ExportProfileManager, SMPTE);
+       REGISTER_CLASS_ENUM (ExportProfileManager, Timecode);
        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 (RegionExportChannelFactory, None);
+       REGISTER_CLASS_ENUM (RegionExportChannelFactory, Raw);
+       REGISTER_CLASS_ENUM (RegionExportChannelFactory, Fades);
+       REGISTER_CLASS_ENUM (RegionExportChannelFactory, Processed);
+       REGISTER (_RegionExportChannelFactory_Type);
+
        REGISTER_CLASS_ENUM (Delivery, Insert);
        REGISTER_CLASS_ENUM (Delivery, Send);
        REGISTER_CLASS_ENUM (Delivery, Listen);
        REGISTER_CLASS_ENUM (Delivery, Main);
+       REGISTER_CLASS_ENUM (Delivery, Aux);
        REGISTER_BITS (_Delivery_Role);
 
        REGISTER_CLASS_ENUM (MuteMaster, PreFader);
@@ -522,4 +554,326 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (IO, Input);
        REGISTER_CLASS_ENUM (IO, Output);
        REGISTER (_IO_Direction);
+
+       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);
+
+       REGISTER_ENUM(Traditional);
+       REGISTER_ENUM(Rectified);
+       REGISTER(_WaveformShape);
+
+       REGISTER_ENUM(AudioTime);
+       REGISTER_ENUM(MusicTime);
+       REGISTER(_PositionLockStyle);
+
+       REGISTER_ENUM (Evoral::OverlapNone);
+       REGISTER_ENUM (Evoral::OverlapInternal);
+       REGISTER_ENUM (Evoral::OverlapStart);
+       REGISTER_ENUM (Evoral::OverlapEnd);
+       REGISTER_ENUM (Evoral::OverlapExternal);
+       REGISTER(_OverlapType);
+}
+
+} /* namespace ARDOUR */
+
+/* deserializing types from ardour/types.h */
+
+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::string s = enum_2_string (var);
+       return o << s;
+}
+
+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::string s = enum_2_string (var);
+       return o << s;
+}
+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::string s = enum_2_string (var);
+       return o << s;
+}
+
+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::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;
+       o >> s;
+       var = (RemoteModel) string_2_enum (s, var);
+       return o;
+}
+
+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::string s;
+       o >> s;
+       var = (EditMode) string_2_enum (s, var);
+       return o;
+}
+
+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::string s;
+       o >> s;
+       var = (ListenPosition) string_2_enum (s, var);
+       return o;
+}
+
+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, 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;
+       o >> s;
+       var = (CrossfadeModel) string_2_enum (s, var);
+       return o;
+}
+
+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, CrossfadeChoice& var)
+{
+       std::string s;
+       o >> s;
+       var = (CrossfadeChoice) string_2_enum (s, var);
+       return o;
+}
+
+std::ostream& operator<<(std::ostream& o, const CrossfadeChoice& var)
+{
+       std::string s = enum_2_string (var);
+       return o << s;
+}
+
+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::string s = enum_2_string (var);
+       return o << s;
+}
+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::string s = enum_2_string (var);
+       return o << s;
+}
+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::string s = enum_2_string (var);
+       return o << s;
+}
+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::string s = enum_2_string (var);
+       return o << s;
+}
+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::string s = enum_2_string (var);
+       return o << s;
+}
+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::string s = enum_2_string (var);
+       return o << s;
+}
+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::string s = enum_2_string (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;
+}
+
+std::istream& operator>>(std::istream& o, Evoral::OverlapType& var)
+{
+       std::string s;
+       o >> s;
+       var = (Evoral::OverlapType) string_2_enum (s, var);
+       return o;
+}
+
+std::ostream& operator<<(std::ostream& o, const Evoral::OverlapType& var)
+{
+       std::string s = enum_2_string (var);
+       return o << s;
 }