ardour/livetrax
13
0
Fork 0
Code

triggerbox: somewhat more sane behavior at sample end

Browse Source
This commit is contained in:
Paul Davis 2021-08-05 15:56:14 -06:00
parent 724087f3fd
commit 28e4e36b00
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,6 +85,7 @@ class LIBARDOUR_API Trigger {
bool stop_requested() const { return _stop_requested; } bool stop_requested() const { return _stop_requested; }
virtual void stop(); virtual void stop();
virtual void retrigger () {}
size_t index() const { return _index; } size_t index() const { return _index; }
@ -115,6 +116,7 @@ class LIBARDOUR_API AudioTrigger : public Trigger {
Sample* run (uint32_t channel, pframes_t& nframes, bool& need_butler); Sample* run (uint32_t channel, pframes_t& nframes, bool& need_butler);
int set_region (boost::shared_ptr<Region>); int set_region (boost::shared_ptr<Region>);
void retrigger ();
private: private:
std::vector<Sample*> data; std::vector<Sample*> data;
@ -123,7 +125,6 @@ class LIBARDOUR_API AudioTrigger : public Trigger {
void drop_data (); void drop_data ();
int load_data (boost::shared_ptr<AudioRegion>); int load_data (boost::shared_ptr<AudioRegion>);
void retrigger ();
}; };
class LIBARDOUR_API TriggerBox : public Processor class LIBARDOUR_API TriggerBox : public Processor

37
libs/ardour/triggerbox.cc
View File

@ -326,13 +326,19 @@ TriggerBox::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
} }
} }
bool err = false;
bool need_butler = false; bool need_butler = false;
size_t max_chans = 0; size_t max_chans = 0;
for (Triggers::iterator t = active_triggers.begin(); !err && t != active_triggers.end(); ++t) { for (Triggers::iterator t = active_triggers.begin(); t != active_triggers.end(); ) {
Trigger* trigger = (*t); Trigger* trigger = (*t);
boost::shared_ptr<Region> r = trigger->region();
if (!r) {
t = active_triggers.erase (t);
continue;
}
sampleoffset_t dest_offset = 0; sampleoffset_t dest_offset = 0;
pframes_t trigger_samples = nframes; pframes_t trigger_samples = nframes;
@ -346,11 +352,12 @@ TriggerBox::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
AudioTrigger* at = dynamic_cast<AudioTrigger*> (trigger); AudioTrigger* at = dynamic_cast<AudioTrigger*> (trigger);
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (trigger->region()); boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (r);
const size_t nchans = ar->n_channels (); const size_t nchans = ar->n_channels ();
max_chans = std::max (max_chans, nchans); max_chans = std::max (max_chans, nchans);
for (uint32_t chan = 0; !err && chan < nchans; ++chan) { bool at_end = false;
for (uint32_t chan = 0; !at_end && chan < nchans; ++chan) {
AudioBuffer& buf = bufs.get_audio (chan); AudioBuffer& buf = bufs.get_audio (chan);
@ -358,9 +365,8 @@ TriggerBox::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
Sample* data = at->run (chan, to_copy, need_butler); Sample* data = at->run (chan, to_copy, need_butler);
if (!data) { if (!data) {
/* XXX need to delete the trigger/put it back in the pool */ at_end = true;
t = active_triggers.erase (t); break;
err = true;
} else { } else {
if (t == active_triggers.begin()) { if (t == active_triggers.begin()) {
buf.read_from (data, to_copy, dest_offset); buf.read_from (data, to_copy, dest_offset);
@ -373,6 +379,23 @@ TriggerBox::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
} }
} }
if (at_end) {
switch (trigger->launch_style()) {
case Trigger::Loop:
trigger->retrigger();
++t;
break;
case Trigger::Gate:
case Trigger::Toggle:
case Trigger::Repeat:
t = active_triggers.erase (t);
break;
}
} else {
++t;
}
} }
ChanCount cc (DataType::AUDIO, max_chans); ChanCount cc (DataType::AUDIO, max_chans);