DenormalModel _DenormalModel;
CrossfadeModel _CrossfadeModel;
LayerModel _LayerModel;
+ InsertMergePolicy _InsertMergePolicy;
ListenPosition _ListenPosition;
SampleFormat _SampleFormat;
CDMarkerFormat _CDMarkerFormat;
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;
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);
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);
REGISTER_ENUM(Legato);
REGISTER_ENUM(Groove);
REGISTER(_QuantizeType);
+
+ REGISTER_ENUM(AudioTime);
+ REGISTER_ENUM(MusicTime);
+ REGISTER(_PositionLockStyle);
}
} /* namespace ARDOUR */
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;
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;
+}