X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fenums.cc;h=6e90bd01f0cb016b31dbd3df08a0e7c58b7fec80;hb=97020209296453f02590cce82b6160ce122aad08;hp=8fdb8462de74faff8950f74148cb614ff4213da0;hpb=2d270094100dd3ec18a552cc9f40057706c3d519;p=ardour.git

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 8fdb8462de..6e90bd01f0 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -32,8 +32,10 @@
 #include "ardour/location.h"
 #include "ardour/midi_model.h"
 #include "ardour/mute_master.h"
+#include "ardour/presentation_info.h"
 #include "ardour/session.h"
 #include "ardour/source.h"
+#include "ardour/tempo.h"
 #include "ardour/track.h"
 #include "ardour/types.h"
 
@@ -72,7 +74,6 @@ setup_enum_writer ()
 	MonitorState _MonitorState;
 	PFLPosition _PFLPosition;
 	AFLPosition _AFLPosition;
-	RemoteModel _RemoteModel;
 	DenormalModel _DenormalModel;
 	LayerModel _LayerModel;
 	InsertMergePolicy _InsertMergePolicy;
@@ -98,11 +99,11 @@ setup_enum_writer ()
 	AutoConnectOption _AutoConnectOption;
 	TracksAutoNamingRule _TracksAutoNamingRule;
 	Session::StateOfTheState _Session_StateOfTheState;
-	Route::Flag _Route_Flag;
 	Source::Flag _Source_Flag;
 	Diskstream::Flag _Diskstream_Flag;
 	Location::Flags _Location_Flags;
 	PositionLockStyle _PositionLockStyle;
+	TempoSection::Type _TempoSection_Type;
 	Track::FreezeState _Track_FreezeState;
 	AutomationList::InterpolationStyle _AutomationList_InterpolationStyle;
 	AnyTime::Type _AnyTime_Type;
@@ -132,25 +133,53 @@ setup_enum_writer ()
 	Evoral::OverlapType _OverlapType;
         BufferingPreset _BufferingPreset;
 	AutoReturnTarget _AutoReturnTarget;
+	PresentationInfo::Flag _PresentationInfo_Flag;
 
 #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 (NullAutomation);
 	REGISTER_ENUM (GainAutomation);
-	REGISTER_ENUM (TrimAutomation);
 	REGISTER_ENUM (PanAzimuthAutomation);
 	REGISTER_ENUM (PanElevationAutomation);
 	REGISTER_ENUM (PanWidthAutomation);
+	REGISTER_ENUM (PanFrontBackAutomation);
+	REGISTER_ENUM (PanLFEAutomation);
 	REGISTER_ENUM (PluginAutomation);
 	REGISTER_ENUM (PluginPropertyAutomation);
 	REGISTER_ENUM (SoloAutomation);
+	REGISTER_ENUM (SoloIsolateAutomation);
+	REGISTER_ENUM (SoloSafeAutomation);
 	REGISTER_ENUM (MuteAutomation);
 	REGISTER_ENUM (MidiCCAutomation);
+	REGISTER_ENUM (MidiPgmChangeAutomation);
+	REGISTER_ENUM (MidiPitchBenderAutomation);
+	REGISTER_ENUM (MidiChannelPressureAutomation);
+	REGISTER_ENUM (MidiSystemExclusiveAutomation);
 	REGISTER_ENUM (FadeInAutomation);
 	REGISTER_ENUM (FadeOutAutomation);
 	REGISTER_ENUM (EnvelopeAutomation);
+	REGISTER_ENUM (RecEnableAutomation);
+	REGISTER_ENUM (RecSafeAutomation);
+	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);
 
 	REGISTER_ENUM (Off);
@@ -293,9 +322,6 @@ setup_enum_writer ()
 	REGISTER_ENUM (DenormalFTZDAZ);
 	REGISTER (_DenormalModel);
 
-	REGISTER_ENUM (UserOrdered);
-	REGISTER_ENUM (MixerOrdered);
-	REGISTER (_RemoteModel);
 	/*
 	 * EditorOrdered has been deprecated
 	 * since the removal of independent
@@ -308,12 +334,12 @@ setup_enum_writer ()
 	REGISTER (_LayerModel);
 
 	REGISTER_ENUM (InsertMergeReject);
-        REGISTER_ENUM (InsertMergeRelax);
-        REGISTER_ENUM (InsertMergeReplace);
-        REGISTER_ENUM (InsertMergeTruncateExisting);
-        REGISTER_ENUM (InsertMergeTruncateAddition);
-        REGISTER_ENUM (InsertMergeExtend);
-        REGISTER (_InsertMergePolicy);
+	REGISTER_ENUM (InsertMergeRelax);
+	REGISTER_ENUM (InsertMergeReplace);
+	REGISTER_ENUM (InsertMergeTruncateExisting);
+	REGISTER_ENUM (InsertMergeTruncateAddition);
+	REGISTER_ENUM (InsertMergeExtend);
+	REGISTER (_InsertMergePolicy);
 
 	REGISTER_ENUM (AfterFaderListen);
 	REGISTER_ENUM (PreFaderListen);
@@ -462,11 +488,6 @@ setup_enum_writer ()
 	REGISTER_CLASS_ENUM (Session, pullup_Minus4Minus1);
 	REGISTER (_Session_PullupFormat);
 
-	REGISTER_CLASS_ENUM (Route, Auditioner);
-	REGISTER_CLASS_ENUM (Route, MasterOut);
-	REGISTER_CLASS_ENUM (Route, MonitorOut);
-	REGISTER_BITS (_Route_Flag);
-
 	REGISTER_CLASS_ENUM (Source, Writable);
 	REGISTER_CLASS_ENUM (Source, CanRename);
 	REGISTER_CLASS_ENUM (Source, Broadcast);
@@ -510,6 +531,10 @@ setup_enum_writer ()
 	REGISTER_CLASS_ENUM (Location, IsSkip);
 	REGISTER_BITS (_Location_Flags);
 
+	REGISTER_CLASS_ENUM (TempoSection, Ramp);
+	REGISTER_CLASS_ENUM (TempoSection, Constant);
+	REGISTER (_TempoSection_Type);
+
 	REGISTER_CLASS_ENUM (Track, NoFreeze);
 	REGISTER_CLASS_ENUM (Track, Frozen);
 	REGISTER_CLASS_ENUM (Track, UnFrozen);
@@ -676,6 +701,19 @@ setup_enum_writer ()
 	REGISTER_ENUM (Loop);
 	REGISTER_ENUM (RegionSelectionStart);
 	REGISTER_BITS (_AutoReturnTarget);
+
+	REGISTER_CLASS_ENUM (PresentationInfo, AudioTrack);
+	REGISTER_CLASS_ENUM (PresentationInfo, MidiTrack);
+	REGISTER_CLASS_ENUM (PresentationInfo, AudioBus);
+	REGISTER_CLASS_ENUM (PresentationInfo, MidiBus);
+	REGISTER_CLASS_ENUM (PresentationInfo, VCA);
+	REGISTER_CLASS_ENUM (PresentationInfo, MasterOut);
+	REGISTER_CLASS_ENUM (PresentationInfo, MonitorOut);
+	REGISTER_CLASS_ENUM (PresentationInfo, Auditioner);
+	REGISTER_CLASS_ENUM (PresentationInfo, Selected);
+	REGISTER_CLASS_ENUM (PresentationInfo, Hidden);
+	REGISTER_CLASS_ENUM (PresentationInfo, OrderSet);
+	REGISTER_BITS (_PresentationInfo_Flag);
 }
 
 } /* namespace ARDOUR */
@@ -808,19 +846,6 @@ std::ostream& operator<<(std::ostream& o, const AFLPosition& 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;