X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fenums.cc;h=d1eca7401c032baae9078083c315a625027d344b;hb=204baa31d842d4c2f833d319b6fa55e402a1bfb8;hp=0676973e53f375b4f84b2ed07bd4d8ef11cac31b;hpb=4a3d7877f6b03fac7755f997b945583ba5732d13;p=ardour.git

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 0676973e53..d1eca7401c 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -27,6 +27,7 @@
 #include "ardour/export_filename.h"
 #include "ardour/export_format_base.h"
 #include "ardour/export_profile_manager.h"
+#include "ardour/export_channel_configuration.h"
 #include "ardour/io.h"
 #include "ardour/location.h"
 #include "ardour/midi_model.h"
@@ -48,12 +49,13 @@ 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;
@@ -65,10 +67,14 @@ 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;
+	InsertMergePolicy _InsertMergePolicy;
 	ListenPosition _ListenPosition;
 	SampleFormat _SampleFormat;
 	CDMarkerFormat _CDMarkerFormat;
@@ -81,8 +87,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,10 +98,7 @@ setup_enum_writer ()
 	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;
@@ -111,10 +113,13 @@ 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;
-	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;
@@ -122,16 +127,11 @@ setup_enum_writer ()
 	Session::SlaveState _Session_SlaveState;
 	MTC_Status _MIDI_MTC_Status;
 
-#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(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);
@@ -140,7 +140,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);
@@ -164,9 +166,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);
 
@@ -206,6 +214,7 @@ setup_enum_writer ()
 
 	REGISTER_ENUM (Slide);
 	REGISTER_ENUM (Splice);
+	REGISTER_ENUM (Lock);
 	REGISTER (_EditMode);
 
 	REGISTER_ENUM (Start);
@@ -222,6 +231,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);
@@ -237,10 +265,13 @@ setup_enum_writer ()
 	REGISTER_ENUM (ShortCrossfade);
 	REGISTER (_CrossfadeModel);
 
-	REGISTER_ENUM (LaterHigher);
-	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);
@@ -271,7 +302,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);
@@ -293,7 +325,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);
@@ -307,7 +339,6 @@ setup_enum_writer ()
 	REGISTER_CLASS_ENUM (SessionEvent, Audition);
 	REGISTER_CLASS_ENUM (SessionEvent, InputConfigurationChange);
 	REGISTER_CLASS_ENUM (SessionEvent, SetPlayAudioRange);
-	REGISTER_CLASS_ENUM (SessionEvent, SetRecordEnable);
 	REGISTER_CLASS_ENUM (SessionEvent, StopOnce);
 	REGISTER_CLASS_ENUM (SessionEvent, AutoLoop);
 	REGISTER (_SessionEvent_Type);
@@ -323,9 +354,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 +361,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);
@@ -374,7 +401,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);
@@ -387,12 +414,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);
@@ -404,53 +431,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);
@@ -525,6 +509,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);
@@ -544,9 +529,14 @@ 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 (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);
@@ -564,12 +554,20 @@ 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);
@@ -584,66 +582,99 @@ setup_enum_writer ()
 	REGISTER_ENUM(Groove);
 	REGISTER(_QuantizeType);
 
+	REGISTER_ENUM(AudioTime);
+	REGISTER_ENUM(MusicTime);
+	REGISTER(_PositionLockStyle);
 }
 
 } /* namespace ARDOUR */
 
 /* 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, 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::istream& operator>>(std::istream& o, RemoteModel& var)
 {
 	std::string s;
 	o >> s;
@@ -651,153 +682,166 @@ 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, InsertMergePolicy& var)
+{
 	std::string s;
 	o >> s;
-	var = (LayerModel) string_2_enum (s, var);
+	var = (InsertMergePolicy) string_2_enum (s, var);
 	return o;
 }
-
-std::ostream& operator<<(std::ostream& o, const LayerModel& 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::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;
+}