ardour/livetrax
13
0
Fork 0
Code

triggerbox: save properties and use Toggle launch style if started from a cue

Browse Source
This commit is contained in:
Paul Davis 2021-12-29 19:27:25 -07:00
parent 027e7302b8
commit 8d97439281
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/triggerbox.h
View File

@ -302,6 +302,7 @@ class LIBARDOUR_API Trigger : public PBD::Stateful {
};
CueModifiedProperties pre_cue_properties;
bool cue_launched;
void push_cue_properties ();
void pop_cue_properties ();

10
libs/ardour/triggerbox.cc
View File

@ -91,6 +91,7 @@ Trigger::Trigger (uint32_t n, TriggerBox& b)
, _stretchable (Properties::stretchable, true)
, _isolated (Properties::isolated, false)
, _color (Properties::color, 0xBEBEBEFF)
, cue_launched (false)
, _barcnt (0.)
, _apparent_tempo (0.)
, expected_end_sample (0)
@ -422,6 +423,13 @@ Trigger::startup()
_gain = _pending_gain;
_loop_cnt = 0;
_explicitly_stopped = false;
if (cue_launched) {
push_cue_properties ();
_launch_style = Toggle;
cue_launched = false;
}
DEBUG_TRACE (DEBUG::Triggers, string_compose ("%1 starts up\n", name()));
PropertyChanged (ARDOUR::Properties::running);
}
@ -522,6 +530,8 @@ Trigger::process_state_requests ()
case Stopped:
DEBUG_TRACE (DEBUG::Triggers, string_compose ("%1 %2 stopped => %3\n", index(), enum_2_string (Stopped), enum_2_string (WaitingToStart)));
_box.queue_explict (index());
cue_launched = (_box.active_scene() >= 0);
std::cerr << index() << " aka " << name() << " launched via cue ? " << cue_launched << std::endl;
break;
case WaitingToStart: