From 4e482076ea8d404e0b97f6d50c6bf064ad97c953 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 6 Jan 2022 11:10:28 -0700 Subject: [PATCH] add config param to control response to cue markers --- libs/ardour/ardour/rc_configuration_vars.h | 1 + libs/ardour/ardour/types.h | 6 ++++++ libs/ardour/ardour/types_convert.h | 1 + libs/ardour/enums.cc | 5 +++++ 4 files changed, 13 insertions(+) diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index d79e9b94e3..f1acbef0a3 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -183,6 +183,7 @@ CONFIG_VARIABLE (AutoReturnTarget, auto_return_target_list, "auto-return-target- CONFIG_VARIABLE (bool, reset_default_speed_on_stop, "reset-default-speed-on-stop", false) CONFIG_VARIABLE (bool, rewind_ffwd_like_tape_decks, "rewind-ffwd-like-tape-decks", true) CONFIG_VARIABLE (bool, auto_return_after_rewind_ffwd, "auto-return-after-rewind-ffwd", false) +CONFIG_VARIABLE (CueBehavior, cue_behavior, "cue-behavior", FollowCues) /* metering */ diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 0df1cdf9e8..203fb9ba50 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -811,6 +811,12 @@ enum LocateTransportDisposition { RollIfAppropriate }; +enum CueBehavior { + FollowCues, + ImplicitlyIgnoreCues, + ExplicitlyIgnoreCues +}; + typedef std::vector CaptureInfos; } // namespace ARDOUR diff --git a/libs/ardour/ardour/types_convert.h b/libs/ardour/ardour/types_convert.h index db0dbf25cb..4bf2778edb 100644 --- a/libs/ardour/ardour/types_convert.h +++ b/libs/ardour/ardour/types_convert.h @@ -75,6 +75,7 @@ DEFINE_ENUM_CONVERT(ARDOUR::InputMeterLayout) DEFINE_ENUM_CONVERT(ARDOUR::MidiPortFlags) DEFINE_ENUM_CONVERT(ARDOUR::TransportRequestType) DEFINE_ENUM_CONVERT(ARDOUR::LoopFadeChoice) +DEFINE_ENUM_CONVERT(ARDOUR::CueBehavior) DEFINE_ENUM_CONVERT(MusicalMode::Type) diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index ced3733609..24483d50af 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -158,6 +158,7 @@ setup_enum_writer () Trigger::State _TriggerState; Trigger::LaunchStyle _TriggerLaunchStyle; Trigger::FollowAction _TriggerFollowAction; + CueBehavior _CueBehavior; #define REGISTER(e) enum_writer.register_distinct (typeid(e).name(), i, s); i.clear(); s.clear() #define REGISTER_BITS(e) enum_writer.register_bits (typeid(e).name(), i, s); i.clear(); s.clear() @@ -877,6 +878,10 @@ setup_enum_writer () REGISTER_CLASS_ENUM (Trigger, Repeat); REGISTER (_TriggerLaunchStyle); + REGISTER_ENUM (FollowCues); + REGISTER_ENUM (ImplicitlyIgnoreCues); + REGISTER_ENUM (ExplicitlyIgnoreCues); + REGISTER (_CueBehavior); } } /* namespace ARDOUR */