change nature of CueBehavior enum to be bitwise
This allows us to OR-in the ImplicitlyIgnoreCues bits, and still toggle FollowCues on and off to indicate user-requested behavior
This commit is contained in:
@@ -812,9 +812,8 @@ enum LocateTransportDisposition {
|
||||
};
|
||||
|
||||
enum CueBehavior {
|
||||
FollowCues,
|
||||
ImplicitlyIgnoreCues,
|
||||
ExplicitlyIgnoreCues
|
||||
FollowCues = 0x1,
|
||||
ImplicitlyIgnoreCues = 0x2
|
||||
};
|
||||
|
||||
typedef std::vector<CaptureInfo*> CaptureInfos;
|
||||
|
||||
@@ -880,8 +880,7 @@ setup_enum_writer ()
|
||||
|
||||
REGISTER_ENUM (FollowCues);
|
||||
REGISTER_ENUM (ImplicitlyIgnoreCues);
|
||||
REGISTER_ENUM (ExplicitlyIgnoreCues);
|
||||
REGISTER (_CueBehavior);
|
||||
REGISTER_BITS (_CueBehavior);
|
||||
}
|
||||
|
||||
} /* namespace ARDOUR */
|
||||
|
||||
@@ -1636,7 +1636,7 @@ Session::first_cue_within (samplepos_t s, samplepos_t e)
|
||||
return active_cue;
|
||||
}
|
||||
|
||||
if (Config->get_cue_behavior() != FollowCues) {
|
||||
if (!(Config->get_cue_behavior() & FollowCues)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user