Add an EnumProperty for enumerated properties and hence make Region::position_lock_style a stateful property.

git-svn-id: svn://localhost/ardour2/branches/3.0@7306 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 17 insertions, 5 deletions

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 2865701f02..2d29a59e8b 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -94,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;
@@ -417,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);
@@ -553,6 +549,10 @@ setup_enum_writer ()
 	REGISTER_ENUM(Legato);
 	REGISTER_ENUM(Groove);
 	REGISTER(_QuantizeType);
+
+	REGISTER_ENUM(AudioTime);
+	REGISTER_ENUM(MusicTime);
+	REGISTER(_PositionLockStyle);
 }
 
 } /* namespace ARDOUR */
@@ -783,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;
+}