move cue-behavior from rc_configuration to per-session config
This commit is contained in:
parent
dcdfd3ff0f
commit
b506a243a2
@ -177,7 +177,6 @@ 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 */
|
||||
|
||||
|
@ -37,6 +37,7 @@ CONFIG_VARIABLE (bool, auto_play, "auto-play", false)
|
||||
CONFIG_VARIABLE (bool, auto_return, "auto-return", false)
|
||||
CONFIG_VARIABLE (bool, auto_input, "auto-input", true)
|
||||
CONFIG_VARIABLE (bool, triggerbox_overrides_disk_monitoring, "triggerbox-overrides-disk-monitoring", true)
|
||||
CONFIG_VARIABLE (CueBehavior, cue_behavior, "cue-behavior", FollowCues)
|
||||
CONFIG_VARIABLE (bool, punch_in, "punch-in", false)
|
||||
CONFIG_VARIABLE (bool, punch_out, "punch-out", false)
|
||||
CONFIG_VARIABLE (bool, count_in, "count-in", false)
|
||||
|
@ -1645,7 +1645,7 @@ Session::first_cue_within (samplepos_t s, samplepos_t e, bool& was_recorded)
|
||||
return active_cue;
|
||||
}
|
||||
|
||||
if (!(Config->get_cue_behavior() & FollowCues)) {
|
||||
if (!(config.get_cue_behavior() & FollowCues)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -2681,7 +2681,7 @@ TriggerBox::parameter_changed (std::string const & param)
|
||||
reconnect_to_default ();
|
||||
|
||||
} else if (param == "cue-behavior") {
|
||||
bool follow = (Config->get_cue_behavior() & FollowCues);
|
||||
bool follow = (_session.config.get_cue_behavior() & FollowCues);
|
||||
if (follow) {
|
||||
|
||||
/* XXX this is all wrong. We have to do the
|
||||
@ -2712,7 +2712,7 @@ TriggerBox::fast_forward (CueEvents const & cues, samplepos_t transport_position
|
||||
{
|
||||
DEBUG_TRACE (DEBUG::Triggers, string_compose ("%1: ffwd to %2\n", order(), transport_position));
|
||||
|
||||
if (!(Config->get_cue_behavior() & FollowCues)) {
|
||||
if (!(_session.config.get_cue_behavior() & FollowCues)) {
|
||||
/* do absolutely nothing */
|
||||
return;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user