ardour/livetrax
13
0
Fork 0
Code

Fix triggerbox cues when looping

Browse Source 
This correctly handles the case when a cue marker is at the
same position as loop-end. Previously the cue was triggered
even though transport looped
This commit is contained in:
Robin Gareus 2024-08-03 20:21:53 +02:00
parent dc5753118c
commit c2bf45a033
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 33 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

@ -732,6 +732,7 @@ class LIBARDOUR_API TriggerBox : public Processor
static PBD::Signal0<void> CueRecordingChanged;
void run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool result_required);
void run_cycle (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes);
bool can_support_io_configuration (const ChanCount& in, ChanCount& out);
bool configure_io (ChanCount in, ChanCount out);

32
libs/ardour/triggerbox.cc
View File

@ -4129,6 +4129,38 @@ TriggerBox::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
return;
}
const Location* const loop_loc = _loop_location;
if (!loop_loc) {
run_cycle (bufs, start_sample, end_sample, speed, nframes);
} else {
const samplepos_t loop_start = loop_loc->start_sample ();
const samplepos_t loop_end = loop_loc->end_sample ();
const samplecnt_t looplen = loop_end - loop_start;
samplecnt_t remain = nframes;
samplepos_t start_pos = start_sample;
while (remain > 0) {
if (start_pos >= loop_end) {
sampleoffset_t start_off = (start_pos - loop_start) % looplen;
start_pos = loop_start + start_off;
}
samplecnt_t move = std::min ((samplecnt_t)nframes, loop_end - start_pos);
run_cycle (bufs, start_pos, start_pos + move, speed, move);
remain -= move;
start_pos += move;
}
}
}
void
TriggerBox::run_cycle (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes)
{
#ifndef NDEBUG
{
Temporal::TempoMap::SharedPtr __tmap (Temporal::TempoMap::use());