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

refactor MIDITrigger's PendingSwap to prepare for a version used by AudioTrigger also

Browse Source
This commit is contained in:
Paul Davis
2025-11-19 15:57:57 -07:00
parent efd7fa7f86
commit 9e72b2b452
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libs/ardour/ardour/triggerbox.h
View File

@@ -505,6 +505,20 @@ class LIBARDOUR_API Trigger : public PBD::Stateful {
void send_property_change (PBD::PropertyChange pc);
virtual void _arm (Temporal::BBT_Offset const &);
struct PendingSwap {
Temporal::Beats play_start;
Temporal::Beats play_end;
Temporal::Beats loop_start;
Temporal::Beats loop_end;
Temporal::Beats length;
virtual ~PendingSwap() {}
};
std::atomic<PendingSwap*> pending_swap;
std::atomic<PendingSwap*> old_pending_swap;
};
class LIBARDOUR_API AudioTrigger : public Trigger {
@@ -714,21 +728,13 @@ class LIBARDOUR_API MIDITrigger : public Trigger {
std::atomic<RTMidiBufferBeats*> rt_midibuffer;
uint32_t iter; /* index into the above RTMidiBufferBeats for current playback */
struct PendingSwap {
struct MIDIPendingSwap : public PendingSwap {
RTMidiBufferBeats* rt_midibuffer;
Temporal::Beats play_start;
Temporal::Beats play_end;
Temporal::Beats loop_start;
Temporal::Beats loop_end;
Temporal::Beats length;
PendingSwap() : rt_midibuffer (nullptr) {}
~PendingSwap() { delete rt_midibuffer; }
MIDIPendingSwap() : rt_midibuffer (nullptr) {}
~MIDIPendingSwap() { delete rt_midibuffer; }
};
std::atomic<PendingSwap*> pending_swap;
std::atomic<PendingSwap*> old_pending_swap;
bool map_change;
int load_data (std::shared_ptr<MidiRegion>);

10
libs/ardour/triggerbox.cc
View File

@@ -256,6 +256,8 @@ Trigger::Trigger (uint32_t n, TriggerBox& b)
, expected_end_sample (0)
, _pending (nullptr)
, last_property_generation (0)
, pending_swap (nullptr)
, old_pending_swap (nullptr)
{
add_property (_launch_style);
add_property (_follow_action0);
@@ -2294,8 +2296,6 @@ MIDITrigger::MIDITrigger (uint32_t n, TriggerBox& b)
, first_event_index (0)
, last_event_index (0)
, rt_midibuffer (nullptr)
, pending_swap (nullptr)
, old_pending_swap (nullptr)
, map_change (false)
{
_channel_map.assign (16, -1);
@@ -2315,7 +2315,7 @@ MIDITrigger::check_edit_swap (timepos_t const & time, bool playing, BufferSet& b
pending swap.
*/
PendingSwap* pending = pending_swap.exchange (nullptr);
MIDIPendingSwap* pending = dynamic_cast<MIDIPendingSwap*> (pending_swap.exchange (nullptr));
RTMidiBufferBeats* old_rtmb = nullptr;
if (!pending) {
@@ -3094,7 +3094,7 @@ MIDITrigger::tempo_map_changed ()
void
MIDITrigger::model_contents_changed ()
{
PendingSwap* pending = new PendingSwap;
MIDIPendingSwap* pending = new MIDIPendingSwap;
pending->rt_midibuffer = new RTMidiBufferBeats;
pending->play_start = _play_start;
@@ -3122,7 +3122,7 @@ MIDITrigger::model_contents_changed ()
void
MIDITrigger::bounds_changed (Temporal::timepos_t const & start, Temporal::timepos_t const & end)
{
PendingSwap* pending = new PendingSwap;
MIDIPendingSwap* pending = new MIDIPendingSwap;
pending->play_start = start.beats();
pending->play_end = end.beats();