ardour/livetrax
13
0
Fork 0
Code

triggerbox: fix quantization involving bars

Browse Source 
The code for this feels potentially expensive. Maybe there's a better way.
This commit is contained in:
Paul Davis 2021-10-14 21:08:34 -06:00
parent 7b2559fe07
commit bc61ff74ad
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/ardour/triggerbox.cc
View File

@ -374,6 +374,8 @@ Trigger::process_state_requests ()
Trigger::RunType
Trigger::maybe_compute_next_transition (Temporal::Beats const & start, Temporal::Beats const & end)
{
using namespace Temporal;
/* In these states, we are not waiting for a transition */
switch (_state) {
@ -387,13 +389,17 @@ Trigger::maybe_compute_next_transition (Temporal::Beats const & start, Temporal:
break;
}
timepos_t ev_time (Temporal::BeatTime);
timepos_t ev_time (BeatTime);
if (_quantization.bars == 0) {
ev_time = timepos_t (start.snap_to (Temporal::Beats (_quantization.beats, _quantization.ticks)));
DEBUG_TRACE (DEBUG::Triggers, string_compose ("%1 quantized with %5 start at %2, sb %3 eb %4\n", index(), ev_time.beats(), start, end, _quantization));
} else {
/* XXX not yet handled */
TempoMap::SharedPtr tmap (TempoMap::use());
BBT_Time bbt = tmap->bbt_at (timepos_t (start));
bbt = bbt.round_up_to_bar ();
bbt.bars = (bbt.bars / _quantization.bars) * _quantization.bars;
ev_time = timepos_t (tmap->quarters_at (bbt));
}
if (ev_time.beats() >= start && ev_time < end) {