X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fenums.cc;h=be468c2534990f897b25e2b6f73bbf0abaf70801;hb=6946bdc0830c9f0971d2cd0d54b27e343c54d96a;hp=817126847d0eed41b1be733e70af0579c755fe1a;hpb=e0ff70cf86c01c42f98faf8b0eaf1a8ccf867946;p=ardour.git

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 817126847d..be468c2534 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -74,7 +74,6 @@ setup_enum_writer ()
 	MonitorState _MonitorState;
 	PFLPosition _PFLPosition;
 	AFLPosition _AFLPosition;
-	RemoteModel _RemoteModel;
 	DenormalModel _DenormalModel;
 	LayerModel _LayerModel;
 	InsertMergePolicy _InsertMergePolicy;
@@ -158,6 +157,7 @@ setup_enum_writer ()
 	REGISTER_ENUM (MidiPgmChangeAutomation);
 	REGISTER_ENUM (MidiPitchBenderAutomation);
 	REGISTER_ENUM (MidiChannelPressureAutomation);
+	REGISTER_ENUM (MidiNotePressureAutomation);
 	REGISTER_ENUM (MidiSystemExclusiveAutomation);
 	REGISTER_ENUM (FadeInAutomation);
 	REGISTER_ENUM (FadeOutAutomation);
@@ -323,9 +323,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
@@ -710,15 +707,14 @@ setup_enum_writer ()
 	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, VCA);
-	REGISTER_CLASS_ENUM (PresentationInfo, Bus);
-	REGISTER_CLASS_ENUM (PresentationInfo, Track);
-	REGISTER_CLASS_ENUM (PresentationInfo, Route);
+	REGISTER_CLASS_ENUM (PresentationInfo, Auditioner);
 	REGISTER_CLASS_ENUM (PresentationInfo, Selected);
 	REGISTER_CLASS_ENUM (PresentationInfo, Hidden);
-	REGISTER (_PresentationInfo_Flag);
+	REGISTER_CLASS_ENUM (PresentationInfo, OrderSet);
+	REGISTER_BITS (_PresentationInfo_Flag);
 }
 
 } /* namespace ARDOUR */
@@ -851,19 +847,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;