allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

triggerbox: use Trigger::disarm() more consistently

Browse Source
This commit is contained in:
Paul Davis
2025-05-13 12:12:43 -06:00
parent a9fad0c4f5
commit bbbedfcd1d
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libs/ardour/triggerbox.cc
View File

@@ -333,6 +333,7 @@ Trigger::disarm ()
{
if (_armed) {
_armed = false;
_box.disarm ();
ArmChanged(); /* EMIT SIGNAL */
TriggerArmChanged (this);
}
@@ -1971,8 +1972,7 @@ AudioTrigger::captured (SlotArmInfo& ai, BufferSet&)
{
if (ai.audio_buf.length == 0) {
/* Nothing captured */
_armed = false;
ArmChanged (); /* EMIT SIGNAL */
disarm ();
return;
}
@@ -2012,9 +2012,7 @@ AudioTrigger::captured (SlotArmInfo& ai, BufferSet&)
TriggerBox::worker->request_build_source (this, timecnt_t (data.length));
_armed = false;
ArmChanged(); /* EMIT SIGNAL */
TriggerArmChanged (this);
disarm ();
}
int
@@ -2546,10 +2544,7 @@ void
MIDITrigger::captured (SlotArmInfo& ai, BufferSet& bufs)
{
if (ai.midi_buf->size() == 0) {
if (_armed) {
_armed = false;
ArmChanged(); /* EMIT SIGNAL */
}
disarm ();
DEBUG_TRACE (DEBUG::Triggers, string_compose ("%1/%2 captured but with no MIDI data\n", _box.order(), index()));
return;
}
@@ -2576,9 +2571,7 @@ MIDITrigger::captured (SlotArmInfo& ai, BufferSet& bufs)
// std::cerr << "capture done, ask for a source of length " << dur.beats().str() << std::endl;
TriggerBox::worker->request_build_source (this, timecnt_t (dur.beats()));
_armed = false;
ArmChanged(); /* EMIT SIGNAL */
TriggerArmChanged (this);
disarm ();
}
void
@@ -3742,12 +3735,6 @@ TriggerBox::arm_from_another_thread (Trigger& slot, samplepos_t now, uint32_t ch
_arm_info = ai;
}
void
TriggerBox::disarm ()
{
_arm_info = nullptr;
}
void
TriggerBox::disarm_all ()
{
@@ -3756,6 +3743,14 @@ TriggerBox::disarm_all ()
}
}
void
TriggerBox::disarm ()
{
/* This must be called as an alternative to ::finish_recording() */
_arm_info = nullptr;
}
void
TriggerBox::finish_recording (BufferSet& bufs)
{