X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fenums.cc;h=103e42402bd98921a519b07c07fe71f029bad2ba;hb=e5ea6d81d8fda4cec717c2f285f499d05b30182a;hp=61a7e9a39f68cf87b9745bc88f0355cd14c12cac;hpb=7c94499aeca8a67ee5f0fe51fb4f957d6618fef4;p=ardour.git

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 61a7e9a39f..103e42402b 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -23,7 +23,7 @@
 #include "evoral/Range.hpp" // shouldn't Evoral have its own enum registration?
 
 #include "ardour/delivery.h"
-#include "ardour/diskstream.h"
+#include "ardour/disk_io.h"
 #include "ardour/export_channel.h"
 #include "ardour/export_filename.h"
 #include "ardour/export_format_base.h"
@@ -58,6 +58,7 @@ setup_enum_writer ()
 	AlignStyle _AlignStyle;
 	AlignChoice _AlignChoice;
 	MeterPoint _MeterPoint;
+	DiskIOPoint _DiskIOPoint;
 	MeterType _MeterType;
 	TrackMode _TrackMode;
 	NoteMode _NoteMode;
@@ -100,7 +101,7 @@ setup_enum_writer ()
 	TracksAutoNamingRule _TracksAutoNamingRule;
 	Session::StateOfTheState _Session_StateOfTheState;
 	Source::Flag _Source_Flag;
-	Diskstream::Flag _Diskstream_Flag;
+	DiskIOProcessor::Flag _DiskIOProcessor_Flag;
 	Location::Flags _Location_Flags;
 	PositionLockStyle _PositionLockStyle;
 	TempoSection::Type _TempoSection_Type;
@@ -131,12 +132,12 @@ setup_enum_writer ()
 	Session::SlaveState _Session_SlaveState;
 	MTC_Status _MIDI_MTC_Status;
 	Evoral::OverlapType _OverlapType;
-    BufferingPreset _BufferingPreset;
+	BufferingPreset _BufferingPreset;
 	AutoReturnTarget _AutoReturnTarget;
 	PresentationInfo::Flag _PresentationInfo_Flag;
 	MusicalMode::Type mode;
 	MidiPortFlags _MidiPortFlags;
-
+		
 #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)
@@ -169,18 +170,6 @@ setup_enum_writer ()
 	REGISTER_ENUM (TrimAutomation);
 	REGISTER_ENUM (PhaseAutomation);
 	REGISTER_ENUM (MonitoringAutomation);
-	REGISTER_ENUM (EQGain);
-	REGISTER_ENUM (EQFrequency);
-	REGISTER_ENUM (EQQ);
-	REGISTER_ENUM (EQShape);
-	REGISTER_ENUM (EQHPF);
-	REGISTER_ENUM (EQEnable);
-	REGISTER_ENUM (CompThreshold);
-	REGISTER_ENUM (CompSpeed);
-	REGISTER_ENUM (CompMode);
-	REGISTER_ENUM (CompMakeup);
-	REGISTER_ENUM (CompRedux);
-	REGISTER_ENUM (CompEnable);
 	REGISTER_ENUM (BusSendLevel);
 	REGISTER_ENUM (BusSendEnable);
 	REGISTER (_AutomationType);
@@ -189,6 +178,7 @@ setup_enum_writer ()
 	REGISTER_ENUM (Write);
 	REGISTER_ENUM (Touch);
 	REGISTER_ENUM (Play);
+	REGISTER_ENUM (Latch);
 	REGISTER_BITS (_AutoState);
 
 	REGISTER_ENUM (CaptureTime);
@@ -207,6 +197,11 @@ setup_enum_writer ()
 	REGISTER_ENUM (MeterCustom);
 	REGISTER (_MeterPoint);
 
+	REGISTER_ENUM (DiskIOPreFader);
+	REGISTER_ENUM (DiskIOPostFader);
+	REGISTER_ENUM (DiskIOCustom);
+	REGISTER (_DiskIOPoint);
+
 	REGISTER_ENUM (MeterMaxSignal);
 	REGISTER_ENUM (MeterMaxPeak);
 	REGISTER_ENUM (MeterPeak);
@@ -403,7 +398,6 @@ setup_enum_writer ()
 	REGISTER (_Session_RecordState);
 
 	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);
@@ -415,7 +409,6 @@ setup_enum_writer ()
 	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, CancelPlayAudioRange);
 	REGISTER_CLASS_ENUM (SessionEvent, RealTimeOperation);
@@ -518,10 +511,10 @@ setup_enum_writer ()
 	REGISTER_ENUM(ExistingNewlyCreatedBoth);
 	REGISTER (_RegionSelectionAfterSplit);
 
-	REGISTER_CLASS_ENUM (Diskstream, Recordable);
-	REGISTER_CLASS_ENUM (Diskstream, Hidden);
-	REGISTER_CLASS_ENUM (Diskstream, Destructive);
-	REGISTER_BITS (_Diskstream_Flag);
+	REGISTER_CLASS_ENUM (DiskIOProcessor, Recordable);
+	REGISTER_CLASS_ENUM (DiskIOProcessor, Hidden);
+	REGISTER_CLASS_ENUM (DiskIOProcessor, Destructive);
+	REGISTER_BITS (_DiskIOProcessor_Flag);
 
 	REGISTER_CLASS_ENUM (Location, IsMark);
 	REGISTER_CLASS_ENUM (Location, IsAutoPunch);
@@ -545,6 +538,8 @@ setup_enum_writer ()
 	REGISTER_CLASS_ENUM (AutomationList, Discrete);
 	REGISTER_CLASS_ENUM (AutomationList, Linear);
 	REGISTER_CLASS_ENUM (AutomationList, Curved);
+	REGISTER_CLASS_ENUM (AutomationList, Logarithmic);
+	REGISTER_CLASS_ENUM (AutomationList, Exponential);
 	REGISTER (_AutomationList_InterpolationStyle);
 
 	REGISTER_CLASS_ENUM (AnyTime, Timecode);