ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

triggerbox: sync ui property state with internal for inactive triggers

Browse Source
This commit is contained in:
Paul Davis 2022-02-09 16:30:02 -07:00
parent a309f237f2
commit 19b844e054
2 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,6 +328,8 @@ class LIBARDOUR_API Trigger : public PBD::Stateful {
void set_pending (Trigger*);
Trigger* swap_pending (Trigger*);
void update_properties ();
static Trigger * const MagicClearPointerValue;
virtual SegmentDescriptor get_segment_descriptor () const = 0;
@ -357,7 +359,6 @@ class LIBARDOUR_API Trigger : public PBD::Stateful {
void copy_ui_state (UIState&);
void copy_to_ui_state ();
void update_properties ();
bool cue_launched;
@ -381,6 +382,7 @@ class LIBARDOUR_API Trigger : public PBD::Stateful {
samplepos_t expected_end_sample;
Temporal::BBT_Offset _start_quantization;
std::atomic<Trigger*> _pending;
std::atomic<unsigned int> last_property_generation;
void when_stopped_during_run (BufferSet& bufs, pframes_t dest_offset);
void set_region_internal (boost::shared_ptr<Region>);
@ -691,6 +693,7 @@ class LIBARDOUR_API TriggerBox : public Processor
void non_realtime_transport_stop (samplepos_t now, bool flush);
void non_realtime_locate (samplepos_t now);
void realtime_handle_transport_stopped ();
void enqueue_trigger_source (PBD::ID queued);

72
libs/ardour/triggerbox.cc
View File

@ -138,6 +138,7 @@ Trigger::Trigger (uint32_t n, TriggerBox& b)
, _meter (4, 4)
, expected_end_sample (0)
, _pending ((Trigger*) 0)
, last_property_generation (0)
{
add_property (_launch_style);
add_property (_follow_action0);
@ -165,37 +166,39 @@ Trigger::request_trigger_delete (Trigger* t)
TriggerBox::worker->request_delete_trigger (t);
}
void
Trigger::copy_ui_state (UIState& uis)
{
unsigned int g = ui_state.generation.load ();
do { uis = ui_state; } while (!ui_state.generation.compare_exchange_strong (g, g+1));
}
void
Trigger::update_properties ()
{
UIState uis;
/* Don't update unless there is evidence of a change */
/* Give ourselves a copy on the stack. XXX might not be necessary */
unsigned int g;
copy_ui_state (uis);
while ((g = ui_state.generation.load()) != last_property_generation) {
_launch_style = uis.launch_style;
_follow_action0 = uis.follow_action0;
_follow_action1 = uis.follow_action1;
_follow_action_probability = uis.follow_action_probability;
_follow_count = uis.follow_count;
_quantization = uis.quantization;
_follow_length = uis.follow_length;
_use_follow_length = uis.use_follow_length;
_legato = uis.legato;
_gain = uis.gain;
_velocity_effect = uis.velocity_effect;
_stretchable = uis.stretchable;
_cue_isolated = uis.cue_isolated;
_stretch_mode = uis.stretch_mode;
std::cerr << "prop copy for " << index() << endl;
_launch_style = ui_state.launch_style;
_follow_action0 = ui_state.follow_action0;
_follow_action1 = ui_state.follow_action1;
_follow_action_probability = ui_state.follow_action_probability;
_follow_count = ui_state.follow_count;
_quantization = ui_state.quantization;
_follow_length = ui_state.follow_length;
_use_follow_length = ui_state.use_follow_length;
_legato = ui_state.legato;
_gain = ui_state.gain;
_velocity_effect = ui_state.velocity_effect;
_stretchable = ui_state.stretchable;
_cue_isolated = ui_state.cue_isolated;
_stretch_mode = ui_state.stretch_mode;
last_property_generation = g;
}
/* we get here when we were able to copy the entire set of properties
* without the ui_state.generation value changing during the copy, or
* when no update appeared to be required.
*/
}
void
@ -3252,9 +3255,28 @@ TriggerBox::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
if (!_currently_playing) {
DEBUG_TRACE (DEBUG::Triggers, "nothing currently playing 1, reset stop_all to false\n");
_stop_all = false;
/* nobody is active, but we should catch up on changes
* requested by the UI
*/
for (auto & trig : all_triggers) {
trig->update_properties();
}
return;
}
/* some trigger is active, but the others should catch up on changes
* requested by the UI
*/
for (auto & trig : all_triggers) {
if (trig != _currently_playing) {
trig->update_properties();
}
}
/* transport must be active for triggers */
if (!_locate_armed) {