X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fenums.cc;h=2d29a59e8bd418c6de71a7e918c89c95995908b3;hb=d488ce49bb71d99d1f23a30ff6594e2ad759f6fa;hp=3f7fee3aeeae872ee6780ff440b6402e4b9b9c73;hpb=061a85191c301ac18f2e8ca59d43127a4499ba96;p=ardour.git

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 3f7fee3aee..2d29a59e8b 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -69,6 +69,7 @@ setup_enum_writer ()
 	DenormalModel _DenormalModel;
 	CrossfadeModel _CrossfadeModel;
 	LayerModel _LayerModel;
+	InsertMergePolicy _InsertMergePolicy;
 	ListenPosition _ListenPosition;
 	SampleFormat _SampleFormat;
 	CDMarkerFormat _CDMarkerFormat;
@@ -93,7 +94,7 @@ setup_enum_writer ()
 	Source::Flag _Source_Flag;
 	Diskstream::Flag _Diskstream_Flag;
 	Location::Flags _Location_Flags;
-	Region::PositionLockStyle _Region_PositionLockStyle;
+	PositionLockStyle _PositionLockStyle;
 	Track::FreezeState _Track_FreezeState;
 	AutomationList::InterpolationStyle _AutomationList_InterpolationStyle;
 	AnyTime::Type _AnyTime_Type;
@@ -238,6 +239,14 @@ setup_enum_writer ()
 	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);
@@ -408,10 +417,6 @@ setup_enum_writer ()
 	REGISTER_CLASS_ENUM (Panner, OppositeDirection);
 	REGISTER (_Panner_LinkDirection);
 
-	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);
@@ -544,6 +549,10 @@ setup_enum_writer ()
 	REGISTER_ENUM(Legato);
 	REGISTER_ENUM(Groove);
 	REGISTER(_QuantizeType);
+
+	REGISTER_ENUM(AudioTime);
+	REGISTER_ENUM(MusicTime);
+	REGISTER(_PositionLockStyle);
 }
 
 } /* namespace ARDOUR */
@@ -655,6 +664,20 @@ std::ostream& operator<<(std::ostream& o, const LayerModel& var)
 	std::string s = enum_2_string (var);
 	return o << s;
 }
+
+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::string s = enum_2_string (var);
+	return o << s;
+}
+
 std::istream& operator>>(std::istream& o, CrossfadeModel& var) 
 { 
 	std::string s;
@@ -760,4 +783,16 @@ std::ostream& operator<<(std::ostream& o, const WaveformShape& 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;
+}