Paul Davis
28db0c1d2b
triggerbox: fix logic error in handling of locate-while-playing-triggers
2022-02-21 12:45:13 -07:00
Paul Davis
92d82866e0
temporal: add some basic BBT time tests
...
Some of the subtraction tests may need revising because it is not immediately clear that the
current answers are correct.
2022-02-21 11:55:44 -07:00
Paul Davis
47bf18101b
triggerbox: don't set transition times when we are not transitioning
...
At some point during code refactoring, we ended up setting up the 3 transition times, intedned
to define when the *previous* transition occured, as we checked to see if a transition
would occur during this ::run() call. This led to (in particular) MIDI clips ending early,
because the transition_beats value was set to the *next* (upcoming) transition, and we used
this to define the timeline position of MIDI events
2022-02-20 11:00:01 -07:00
Paul Davis
b9de15d285
triggerbox: split apart semantics of WaitingToStop
...
This allows for a different quantization to be used when WaitingToSwitch,
used when we explicitly start a different Trigger. When "just stopping"
we continue to use 1 bar quantization; when switching to a different
Trigger we use the quantization of the next Trigger
2022-02-20 09:20:47 -07:00
Ben Loftis
b506a243a2
move cue-behavior from rc_configuration to per-session config
2022-02-19 11:48:56 -06:00
Paul Davis
3bfcfe178d
triggerbox: some work towards keeping GUI state in sync with "Play Cues"
...
This still needs some mechanism to request a fast-forward when "Play Cues" is enabled
in a (G)UI thread
2022-02-19 08:53:30 -07:00
Paul Davis
a01325c693
triggerbox: NOOP: whitespace cleanup
2022-02-18 18:02:56 -07:00
Paul Davis
1e7ca734d6
triggerbox: reapply change in 9abc4642 with more explanatory comments
2022-02-18 18:01:52 -07:00
Paul Davis
00185aadcf
triggerbox: leave a possibly helpful comment
2022-02-18 12:57:14 -07:00
Paul Davis
f5ef5f44a3
triggerbox: include change intended to be in cb815bf8d
...
This properly splits the condition into "before final beat" and
"after final beat"
2022-02-18 12:57:14 -07:00
Paul Davis
66b9bc5c40
triggerbox: alter several DEBUG_TRACE statements
2022-02-18 12:57:14 -07:00
Paul Davis
fe76432061
triggerbox: help MIDITriggers find their ends consistently
2022-02-18 12:57:14 -07:00
Paul Davis
19f6a6a739
triggerbox: during fast-forward, if there's nothing to do, set_currently_playing to null
...
if left non-null, the next TriggerBox::run() method will start the transport
rolling.
2022-02-18 12:57:14 -07:00
Paul Davis
8a36f9fce8
triggerbox: reset _loop_cnt to zero on shutdown
...
This helps with preventing _loop_cnt incrementing to unintended values.
2022-02-18 12:57:14 -07:00
Paul Davis
0762ef4f35
triggerbox: remove Playout enum from enums registation
2022-02-18 12:57:14 -07:00
Paul Davis
401e5a572c
triggerbox: clean up comments for Trigger state decls
2022-02-18 12:57:14 -07:00
Paul Davis
4b7c0448e4
triggerbox: remove Playout as a possible state and use a separate bool
...
A trigger can be in a playout state when we decide to change its
state to WaitingToStop (e.g. due to a cue marker). This design
leaves the playout condition "in effect" despite the state changing.
2022-02-18 12:57:14 -07:00
Ben Loftis
fbbe74a530
triggerbox: revert gain() as a queued UISTate value
...
It's impractical/impossible to set the gain if you have to wait for a retrigger
2022-02-18 11:15:43 -06:00
Paul Davis
c09ffd4fcd
triggerbox: consolidate ::start_and_roll_to() across Audio & MIDI triggers
...
This uses a mild trick to pass both the object and ptr-to-member-function from the child class
to the parent class.
Note: before this commit, both instances of ::start_and_roll_to() were identical.
2022-02-15 16:24:01 -07:00
Paul Davis
e75a8ab77c
triggerbox: clarify handling of end-of-clip conditions
...
This doesn't enter Playout state, when the final event matches the predicted
final beat, but also returns the correct number of frames covered
2022-02-15 15:28:01 -07:00
Ben Loftis
9abc4642ed
triggerbox: fix midi timing in the case where a note-off arrives exactly at the end of the clip (amends cbbe5)
2022-02-14 21:30:23 -06:00
Paul Davis
8741c4cc5d
triggerbox: NOOP - rename template parameter for *_run<bool> to be more clear about its purpose
2022-02-14 18:13:06 -07:00
Paul Davis
cb815bf8dd
triggerbox: drop useless computation
2022-02-14 18:09:03 -07:00
Paul Davis
cbbe595162
triggerbox: fix end-handling of MIDI triggers (again)
...
If we reach the last event in a MIDI file, the test to enter Playout
is whether the last event is *before* not at or later to our computed
final beat.
2022-02-14 18:07:54 -07:00
Paul Davis
91e7361e08
triggerbox: ensure _currently_playing reflects fast_forward logic
...
If we decide after fast forwarding that this TriggerBox has no triggers
active at the transport position, we must mark _currently_playing as null,
because otherwise the TB can still start the transport (in error) during
run()
2022-02-14 12:59:24 -07:00
Paul Davis
511b09b3d6
triggerbox: avoid double-accounting for buffer offset in MIDI triggers
...
Because MIDI triggers compute buffer-relative timestamps using
timeline_samples - start_sample, this already takes into account
any offset to the start of the trigger. We still need to use dest_offset
if a non-zero value was passed into ::midi_run(), but we do NOT
want to have it contain the "offset to start of trigger in process
cycle" as well. Instead of trying to special case
::maybe_compute_next_transition(), we just pass a dummy pframes_t
to that method, leaving dest_offset as it was passed into ::midi_run()
2022-02-14 12:56:18 -07:00
Paul Davis
374fa48fad
triggerbox: consolidate position-as-fraction code
...
Both trigger types now use a process_index and final_processed_sample value
to compute their current position-as-fraction
2022-02-14 09:53:00 -07:00
John Emmas
5af43793d3
Modify 'ARDOUR::cue_marker_name()' to be accessible outside of libardour
2022-02-14 10:19:47 +00:00
Paul Davis
c5d7883538
temporal: add skeleton for Timeline (timepos_t/timecnt_t) tests
2022-02-12 22:25:17 -07:00
Paul Davis
baaf332a94
temporal: add skeleton for TempoMap tests
2022-02-12 22:25:17 -07:00
Paul Davis
14ac8fd36b
skeleton for temporal/BBT testing (empty for now)
2022-02-12 17:51:30 -07:00
Paul Davis
f641a0559f
temporal: missing test source
2022-02-12 15:18:19 -07:00
Paul Davis
04bd9187e4
temporal: add (back) first set of unit tests
...
This just uses the old Evoral BeatTest. Some of the tests needed amending
because temporal uses rint() to convert between float and int, not just
a cast.
2022-02-12 15:12:35 -07:00
Ben Loftis
e41729d10c
triggerbox: remove excess debug printouts
2022-02-12 11:14:12 -06:00
Ben Loftis
8a3b5751fb
triggerbox: initialize follow-count more reliably. this way queues a UIState
2022-02-12 11:13:30 -06:00
Ben Loftis
ad7db33666
triggerbox: remove redundant code; set_segment_tempo takes care of this later
2022-02-12 11:12:33 -06:00
Ben Loftis
563dc9ae21
triggerbox: setup_stretcher must be called for stretch_mode to have any effect
2022-02-12 11:12:08 -06:00
Ben Loftis
227815ebab
fix crash introduced in d8b3
2022-02-12 09:34:42 -06:00
Ben Loftis
d8b3fbb94e
beatcnt is a derived property from tempo and segment-length
2022-02-12 09:04:48 -06:00
Paul Davis
b3ec5df8a8
triggerbox: some additional DEBUG_TRACE messages
2022-02-11 15:22:45 -07:00
Ben Loftis
40a1997c0e
triggerbox: reimplement enqueue_trigger_source using a map of UISTate entries
...
* "Range->Bounce to Trigger Clip" needs to set tempo
* Range->bounce can operate on multiple tracks (regions) in one operation
2022-02-11 15:31:54 -06:00
Ben Loftis
742e3659ff
triggerbox: add name, color and tempo to UIState; used for gui operations like d+d
2022-02-11 15:25:59 -06:00
Ben Loftis
37a5edb2cd
triggerbox: initialize values of UIState (c++11 style)
2022-02-11 15:25:59 -06:00
Paul Davis
1777f9af0c
triggerbox: working (?) "stop all cues" cue marker
2022-02-11 13:36:58 -07:00
Paul Davis
98f1b4364d
triggerbox: implement function for translatable marker names
2022-02-11 11:33:27 -07:00
Paul Davis
914b2447b8
triggerbox: a cue marker/event with cue-id < 0 means "stop all"
2022-02-11 11:33:06 -07:00
Paul Davis
a1384d2789
triggerbox; fast-forward should do nothing if we are not use cue markers
2022-02-11 10:33:11 -07:00
Paul Davis
d18426ee95
debug output to show contents of trigger property changes
2022-02-11 10:32:50 -07:00
Paul Davis
f7881af554
do not recurse
2022-02-11 10:21:48 -07:00
Paul Davis
008f0d4e4c
triggerbox: do not send Trigger property updates while fast forwarding
2022-02-11 10:16:04 -07:00
