ardour/livetrax
13
0
Fork 0
Code

triggerbox: use custom (threaded) deleter for MIDITriggers just like AudioTriggers

Browse Source
This commit is contained in:
Paul Davis 2021-12-27 12:04:39 -07:00
parent 3755c04786
commit f9903a7a8b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ardour/triggerbox.cc
View File

@ -2740,12 +2740,18 @@ TriggerBox::set_state (const XMLNode& node, int version)
for (XMLNodeList::const_iterator t = tchildren.begin(); t != tchildren.end(); ++t) { for (XMLNodeList::const_iterator t = tchildren.begin(); t != tchildren.end(); ++t) {
TriggerPtr trig; TriggerPtr trig;
/* Note use of a custom delete function. We cannot
delete the old trigger from the RT context where the
trigger swap will happen, so we will ask the trigger
helper thread to take care of it.
*/
if (_data_type == DataType::AUDIO) { if (_data_type == DataType::AUDIO) {
trig.reset (new AudioTrigger (all_triggers.size(), *this), Trigger::request_trigger_delete); trig.reset (new AudioTrigger (all_triggers.size(), *this), Trigger::request_trigger_delete);
all_triggers.push_back (trig); all_triggers.push_back (trig);
trig->set_state (**t, version); trig->set_state (**t, version);
} else if (_data_type == DataType::MIDI) { } else if (_data_type == DataType::MIDI) {
trig = boost::make_shared<MIDITrigger> (all_triggers.size(), *this); trig.reset (new MIDITrigger (all_triggers.size(), *this), Trigger::request_trigger_delete);
all_triggers.push_back (trig); all_triggers.push_back (trig);
trig->set_state (**t, version); trig->set_state (**t, version);
} }