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

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 9fc1ef96ce..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"
@@ -54,6 +55,7 @@ setup_enum_writer ()
 
 	OverlapType _OverlapType;
 	AlignStyle _AlignStyle;
+	AlignChoice _AlignChoice;
 	MeterPoint _MeterPoint;
 	TrackMode _TrackMode;
 	NoteMode _NoteMode;
@@ -65,10 +67,13 @@ 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;
@@ -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;
@@ -109,11 +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::NoteDiffCommand::Property _MidiModel_NoteDiffCommand_Property;
 	MidiModel::SysExDiffCommand::Property _MidiModel_SysExDiffCommand_Property;
+	MidiModel::PatchChangeDiffCommand::Property _MidiModel_PatchChangeDiffCommand_Property;
 	WaveformScale _WaveformScale;
 	WaveformShape _WaveformShape;
 	QuantizeType _QuantizeType;
@@ -134,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);
@@ -158,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);
 
@@ -200,6 +214,7 @@ setup_enum_writer ()
 
 	REGISTER_ENUM (Slide);
 	REGISTER_ENUM (Splice);
+	REGISTER_ENUM (Lock);
 	REGISTER (_EditMode);
 
 	REGISTER_ENUM (Start);
@@ -216,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);
@@ -231,11 +265,6 @@ 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);
@@ -273,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);
@@ -324,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);
@@ -334,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);
@@ -409,10 +435,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);
@@ -507,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);
@@ -536,7 +563,12 @@ setup_enum_writer ()
 
 	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);
@@ -559,240 +591,257 @@ 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 = (RemoteModel) string_2_enum (s, var);
+	var = (PFLPosition) string_2_enum (s, var);
 	return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const RemoteModel& var) 
+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, EditMode& var) 
-{ 
+
+std::istream& operator>>(std::istream& o, AFLPosition& var)
+{
 	std::string s;
 	o >> s;
-	var = (EditMode) string_2_enum (s, var);
+	var = (AFLPosition) string_2_enum (s, var);
 	return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const EditMode& var) 
-{ 
+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, ListenPosition& var) 
-{ 
+
+std::istream& operator>>(std::istream& o, RemoteModel& var)
+{
 	std::string s;
 	o >> s;
-	var = (ListenPosition) string_2_enum (s, var);
+	var = (RemoteModel) string_2_enum (s, var);
 	return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const ListenPosition& 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, LayerModel& var) 
-{ 
+std::istream& operator>>(std::istream& o, EditMode& var)
+{
 	std::string s;
 	o >> s;
-	var = (LayerModel) string_2_enum (s, var);
+	var = (EditMode) string_2_enum (s, var);
 	return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const LayerModel& 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::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::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;
 }