DenormalModel _DenormalModel;
CrossfadeModel _CrossfadeModel;
LayerModel _LayerModel;
+ InsertMergePolicy _InsertMergePolicy;
ListenPosition _ListenPosition;
SampleFormat _SampleFormat;
CDMarkerFormat _CDMarkerFormat;
SessionEvent::Type _SessionEvent_Type;
TimecodeFormat _Session_TimecodeFormat;
Session::PullupFormat _Session_PullupFormat;
- AudioRegion::FadeShape _AudioRegion_FadeShape;
+ FadeShape _FadeShape;
Panner::LinkDirection _Panner_LinkDirection;
IOChange _IOChange;
AutomationType _AutomationType;
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;
#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 (NoChange);
- REGISTER_ENUM (ConfigurationChanged);
- REGISTER_ENUM (ConnectionsChanged);
- REGISTER_BITS (_IOChange);
-
REGISTER_ENUM (OverlapNone);
REGISTER_ENUM (OverlapInternal);
REGISTER_ENUM (OverlapStart);
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 (_Session_RecordState);
REGISTER_CLASS_ENUM (SessionEvent, SetTransportSpeed);
- REGISTER_CLASS_ENUM (SessionEvent, SetDiskstreamSpeed);
+ REGISTER_CLASS_ENUM (SessionEvent, SetTrackSpeed);
REGISTER_CLASS_ENUM (SessionEvent, Locate);
REGISTER_CLASS_ENUM (SessionEvent, LocateRoll);
REGISTER_CLASS_ENUM (SessionEvent, LocateRollLocate);
REGISTER_CLASS_ENUM (Route, Hidden);
REGISTER_CLASS_ENUM (Route, MasterOut);
- REGISTER_CLASS_ENUM (Route, ControlOut);
+ REGISTER_CLASS_ENUM (Route, MonitorOut);
REGISTER_BITS (_Route_Flag);
REGISTER_CLASS_ENUM (Source, Writable);
REGISTER_CLASS_ENUM (Source, Destructive);
REGISTER_BITS (_Source_Flag);
- REGISTER_CLASS_ENUM (AudioRegion, Linear);
- REGISTER_CLASS_ENUM (AudioRegion, Fast);
- REGISTER_CLASS_ENUM (AudioRegion, Slow);
- REGISTER_CLASS_ENUM (AudioRegion, LogA);
- REGISTER_CLASS_ENUM (AudioRegion, LogB);
- REGISTER (_AudioRegion_FadeShape);
+ REGISTER_ENUM (FadeLinear);
+ REGISTER_ENUM (FadeFast);
+ REGISTER_ENUM (FadeSlow);
+ REGISTER_ENUM (FadeLogA);
+ REGISTER_ENUM (FadeLogB);
+ REGISTER (_FadeShape);
REGISTER_CLASS_ENUM (Diskstream, Recordable);
REGISTER_CLASS_ENUM (Diskstream, Hidden);
REGISTER_CLASS_ENUM (Location, IsAutoLoop);
REGISTER_CLASS_ENUM (Location, IsHidden);
REGISTER_CLASS_ENUM (Location, IsCDMarker);
- REGISTER_CLASS_ENUM (Location, IsEnd);
+ REGISTER_CLASS_ENUM (Location, IsSessionRange);
REGISTER_CLASS_ENUM (Location, IsRangeMarker);
- REGISTER_CLASS_ENUM (Location, IsStart);
REGISTER_BITS (_Location_Flags);
REGISTER_CLASS_ENUM (Panner, SameDirection);
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;
+}