along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <cmath>
#include <climits>
#include <cfloat>
+#include <algorithm>
#include <set>
#include <pbd/xml++.h>
#include <pbd/stacktrace.h>
#include <pbd/enumwriter.h>
+#include <pbd/convert.h>
#include <ardour/audioregion.h>
#include <ardour/session.h>
#include <ardour/playlist.h>
#include <ardour/audiofilter.h>
#include <ardour/audiofilesource.h>
-#include <ardour/destructive_filesource.h>
#include <ardour/region_factory.h>
+#include <ardour/transient_detector.h>
#include "i18n.h"
#include <locale.h>
using namespace std;
using namespace ARDOUR;
+using namespace PBD;
/* a Session will reset these to its chosen defaults by calling AudioRegion::set_default_fade() */
set_default_envelope ();
listen_to_my_curves ();
+ listen_to_my_sources ();
}
AudioRegion::AudioRegion (boost::shared_ptr<AudioSource> src, nframes_t start, nframes_t length, const string& name, layer_t layer, Flag flags)
/* basic AudioRegion constructor */
sources.push_back (src);
- master_sources.push_back (src);
+ master_sources.push_back (src);
src->GoingAway.connect (mem_fun (*this, &AudioRegion::source_deleted));
boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> (src);
set_default_envelope ();
listen_to_my_curves ();
+ listen_to_my_sources ();
}
-AudioRegion::AudioRegion (SourceList& srcs, nframes_t start, nframes_t length, const string& name, layer_t layer, Flag flags)
+AudioRegion::AudioRegion (const SourceList& srcs, nframes_t start, nframes_t length, const string& name, layer_t layer, Flag flags)
: Region (start, length, name, layer, flags),
_fade_in (0.0, 2.0, 1.0, false),
_fade_out (0.0, 2.0, 1.0, false),
_envelope (0.0, 2.0, 1.0, false)
{
/* basic AudioRegion constructor */
-
- for (SourceList::iterator i=srcs.begin(); i != srcs.end(); ++i) {
+
+ for (SourceList::const_iterator i=srcs.begin(); i != srcs.end(); ++i) {
sources.push_back (*i);
master_sources.push_back (*i);
(*i)->GoingAway.connect (mem_fun (*this, &AudioRegion::source_deleted));
set_default_envelope ();
listen_to_my_curves ();
+ listen_to_my_sources ();
}
(*i)->GoingAway.connect (mem_fun (*this, &AudioRegion::source_deleted));
}
master_sources.push_back (*i);
+
}
/* return to default fades if the existing ones are too long */
_scale_amplitude = other->_scale_amplitude;
listen_to_my_curves ();
+ listen_to_my_sources ();
}
AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other)
: Region (other),
_fade_in (other->_fade_in),
_fade_out (other->_fade_out),
- _envelope (other->_envelope)
+ _envelope (other->_envelope)
+
{
/* Pure copy constructor */
}
_scale_amplitude = other->_scale_amplitude;
- _envelope = other->_envelope;
_fade_in_disabled = 0;
_fade_out_disabled = 0;
-
+
+ listen_to_my_curves ();
+ listen_to_my_sources ();
+}
+
+AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other, const SourceList& srcs,
+ nframes_t length, const string& name, layer_t layer, Flag flags)
+ : Region (other, length, name, layer, flags),
+ _fade_in (other->_fade_in),
+ _fade_out (other->_fade_out),
+ _envelope (other->_envelope)
+
+{
+ /* make-a-sort-of-copy-with-different-sources constructor (used by audio filter) */
+
+ set<boost::shared_ptr<AudioSource> > unique_srcs;
+
+ for (SourceList::const_iterator i=srcs.begin(); i != srcs.end(); ++i) {
+ sources.push_back (*i);
+ master_sources.push_back (*i);
+ (*i)->GoingAway.connect (mem_fun (*this, &AudioRegion::source_deleted));
+
+ boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> ((*i));
+ if (afs) {
+ afs->HeaderPositionOffsetChanged.connect (mem_fun (*this, &AudioRegion::source_offset_changed));
+ }
+ }
+
+ _scale_amplitude = other->_scale_amplitude;
+
+ _fade_in_disabled = 0;
+ _fade_out_disabled = 0;
+
listen_to_my_curves ();
+ listen_to_my_sources ();
}
AudioRegion::AudioRegion (boost::shared_ptr<AudioSource> src, const XMLNode& node)
}
listen_to_my_curves ();
+ listen_to_my_sources ();
}
AudioRegion::AudioRegion (SourceList& srcs, const XMLNode& node)
}
listen_to_my_curves ();
+ listen_to_my_sources ();
}
AudioRegion::~AudioRegion ()
for (SourceList::const_iterator i = sources.begin(); i != sources.end(); ++i) {
(*i)->remove_playlist (pl);
}
+ for (SourceList::const_iterator i = master_sources.begin(); i != master_sources.end(); ++i) {
+ (*i)->remove_playlist (pl);
+ }
}
notify_callbacks ();
GoingAway (); /* EMIT SIGNAL */
}
+void
+AudioRegion::listen_to_my_sources ()
+{
+ for (SourceList::const_iterator i = sources.begin(); i != sources.end(); ++i) {
+ (*i)->AnalysisChanged.connect (mem_fun (*this, &AudioRegion::invalidate_transients));
+ }
+}
+
void
AudioRegion::listen_to_my_curves ()
{
}
bool
-AudioRegion::verify_length (nframes_t len)
+AudioRegion::verify_length (nframes_t& len)
{
boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(source());
return true;
}
+ nframes_t maxlen = 0;
+
for (uint32_t n=0; n < sources.size(); ++n) {
- if (_start > sources[n]->length() - len) {
- return false;
- }
+ maxlen = max (maxlen, sources[n]->length() - _start);
}
+
+ len = min (len, maxlen);
+
return true;
}
bool
-AudioRegion::verify_start_and_length (nframes_t new_start, nframes_t new_length)
+AudioRegion::verify_start_and_length (nframes_t new_start, nframes_t& new_length)
{
boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(source());
return true;
}
+ nframes_t maxlen = 0;
+
for (uint32_t n=0; n < sources.size(); ++n) {
- if (new_length > sources[n]->length() - new_start) {
- return false;
- }
+ maxlen = max (maxlen, sources[n]->length() - new_start);
}
+
+ new_length = min (new_length, maxlen);
+
return true;
}
+
bool
AudioRegion::verify_start (nframes_t pos)
{
}
}
+nframes64_t
+AudioRegion::read (Sample* buf, nframes64_t timeline_position, nframes64_t cnt, int channel) const
+{
+ /* raw read, no fades, no gain, nada */
+ return _read_at (sources, _length, buf, 0, 0, _position + timeline_position, cnt, channel, 0, 0, ReadOps (0));
+}
+
+nframes64_t
+AudioRegion::read_with_ops (Sample* buf, nframes64_t file_position, nframes64_t cnt, int channel, ReadOps rops) const
+{
+ return _read_at (sources, _length, buf, 0, 0, file_position, cnt, channel, 0, 0, rops);
+}
+
nframes_t
-AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nframes_t position,
+AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nframes_t file_position,
nframes_t cnt,
uint32_t chan_n, nframes_t read_frames, nframes_t skip_frames) const
{
- return _read_at (sources, buf, mixdown_buffer, gain_buffer, position, cnt, chan_n, read_frames, skip_frames);
+ /* regular diskstream/butler read complete with fades etc */
+ return _read_at (sources, _length, buf, mixdown_buffer, gain_buffer, file_position, cnt,
+ chan_n, read_frames, skip_frames, ReadOps (~0));
}
nframes_t
AudioRegion::master_read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nframes_t position,
nframes_t cnt, uint32_t chan_n) const
{
- return _read_at (master_sources, buf, mixdown_buffer, gain_buffer, position, cnt, chan_n, 0, 0);
+ /* do not read gain/scaling/fades and do not count this disk i/o in statistics */
+
+ return _read_at (master_sources, master_sources.front()->length(), buf, mixdown_buffer,
+ gain_buffer, position, cnt, chan_n, 0, 0, ReadOps (0));
}
nframes_t
-AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buffer, float *gain_buffer,
+AudioRegion::_read_at (const SourceList& srcs, nframes_t limit,
+ Sample *buf, Sample *mixdown_buffer, float *gain_buffer,
nframes_t position, nframes_t cnt,
- uint32_t chan_n, nframes_t read_frames, nframes_t skip_frames) const
+ uint32_t chan_n,
+ nframes_t read_frames,
+ nframes_t skip_frames,
+ ReadOps rops) const
{
nframes_t internal_offset;
nframes_t buf_offset;
nframes_t to_read;
+ bool raw = (rops == ReadOpsNone);
- /* precondition: caller has verified that we cover the desired section */
-
- if (chan_n >= sources.size()) {
+ if (muted() && !raw) {
return 0; /* read nothing */
}
-
+
+ /* precondition: caller has verified that we cover the desired section */
+
if (position < _position) {
internal_offset = 0;
buf_offset = _position - position;
buf_offset = 0;
}
- if (internal_offset >= _length) {
+ if (internal_offset >= limit) {
return 0; /* read nothing */
}
- if ((to_read = min (cnt, _length - internal_offset)) == 0) {
+ if ((to_read = min (cnt, limit - internal_offset)) == 0) {
return 0; /* read nothing */
}
- if (opaque()) {
+ if (opaque() || raw) {
/* overwrite whatever is there */
mixdown_buffer = buf + buf_offset;
} else {
mixdown_buffer += buf_offset;
}
- if (muted()) {
- return 0; /* read nothing */
+ if (rops & ReadOpsCount) {
+ _read_data_count = 0;
}
- _read_data_count = 0;
+ if (chan_n < n_channels()) {
- if (srcs[chan_n]->read (mixdown_buffer, _start + internal_offset, to_read) != to_read) {
- return 0; /* "read nothing" */
- }
-
- _read_data_count += srcs[chan_n]->read_data_count();
-
- /* fade in */
-
- if (_flags & FadeIn) {
-
- nframes_t fade_in_length = (nframes_t) _fade_in.back()->when;
+ if (srcs[chan_n]->read (mixdown_buffer, _start + internal_offset, to_read) != to_read) {
+ return 0; /* "read nothing" */
+ }
- /* see if this read is within the fade in */
+ if (rops & ReadOpsCount) {
+ _read_data_count += srcs[chan_n]->read_data_count();
+ }
- if (internal_offset < fade_in_length) {
-
- nframes_t limit;
+ } else {
+
+ /* track is N-channel, this region has less channels; silence the ones
+ we don't have.
+ */
- limit = min (to_read, fade_in_length - internal_offset);
+ memset (mixdown_buffer, 0, sizeof (Sample) * cnt);
+ }
- _fade_in.get_vector (internal_offset, internal_offset+limit, gain_buffer, limit);
+ if (rops & ReadOpsFades) {
+
+ /* fade in */
- for (nframes_t n = 0; n < limit; ++n) {
- mixdown_buffer[n] *= gain_buffer[n];
+ if ((_flags & FadeIn) && Config->get_use_region_fades()) {
+
+ nframes_t fade_in_length = (nframes_t) _fade_in.back()->when;
+
+ /* see if this read is within the fade in */
+
+ if (internal_offset < fade_in_length) {
+
+ nframes_t fi_limit;
+
+ fi_limit = min (to_read, fade_in_length - internal_offset);
+
+ _fade_in.get_vector (internal_offset, internal_offset+fi_limit, gain_buffer, fi_limit);
+
+ for (nframes_t n = 0; n < fi_limit; ++n) {
+ mixdown_buffer[n] *= gain_buffer[n];
+ }
}
}
- }
-
- /* fade out */
-
- if (_flags & FadeOut) {
-
- /* see if some part of this read is within the fade out */
+
+ /* fade out */
+
+ if ((_flags & FadeOut) && Config->get_use_region_fades()) {
+ /* see if some part of this read is within the fade out */
+
/* ................. >| REGION
- _length
+ limit
{ } FADE
fade_out_length
^
- _length - fade_out_length
+ limit - fade_out_length
|--------------|
^internal_offset
^internal_offset + to_read
-
- we need the intersection of [internal_offset,internal_offset+to_read] with
- [_length - fade_out_length, _length]
-
+
+ we need the intersection of [internal_offset,internal_offset+to_read] with
+ [limit - fade_out_length, limit]
+
*/
- nframes_t fade_out_length = (nframes_t) _fade_out.back()->when;
- nframes_t fade_interval_start = max(internal_offset, _length-fade_out_length);
- nframes_t fade_interval_end = min(internal_offset + to_read, _length);
+ nframes_t fade_out_length = (nframes_t) _fade_out.back()->when;
+ nframes_t fade_interval_start = max(internal_offset, limit-fade_out_length);
+ nframes_t fade_interval_end = min(internal_offset + to_read, limit);
- if (fade_interval_end > fade_interval_start) {
- /* (part of the) the fade out is in this buffer */
-
- nframes_t limit = fade_interval_end - fade_interval_start;
- nframes_t curve_offset = fade_interval_start - (_length-fade_out_length);
- nframes_t fade_offset = fade_interval_start - internal_offset;
-
- _fade_out.get_vector (curve_offset,curve_offset+limit, gain_buffer, limit);
-
- for (nframes_t n = 0, m = fade_offset; n < limit; ++n, ++m) {
- mixdown_buffer[m] *= gain_buffer[n];
- }
- }
+ if (fade_interval_end > fade_interval_start) {
+ /* (part of the) the fade out is in this buffer */
+ nframes_t fo_limit = fade_interval_end - fade_interval_start;
+ nframes_t curve_offset = fade_interval_start - (limit-fade_out_length);
+ nframes_t fade_offset = fade_interval_start - internal_offset;
+
+ _fade_out.get_vector (curve_offset,curve_offset+fo_limit, gain_buffer, fo_limit);
+
+ for (nframes_t n = 0, m = fade_offset; n < fo_limit; ++n, ++m) {
+ mixdown_buffer[m] *= gain_buffer[n];
+ }
+ }
+
+ }
}
-
- /* Regular gain curves */
-
- if (envelope_active()) {
+
+ /* Regular gain curves and scaling */
+
+ if ((rops & ReadOpsOwnAutomation) && envelope_active()) {
_envelope.get_vector (internal_offset, internal_offset + to_read, gain_buffer, to_read);
- if (_scale_amplitude != 1.0f) {
+ if ((rops & ReadOpsOwnScaling) && _scale_amplitude != 1.0f) {
for (nframes_t n = 0; n < to_read; ++n) {
mixdown_buffer[n] *= gain_buffer[n] * _scale_amplitude;
}
mixdown_buffer[n] *= gain_buffer[n];
}
}
- } else if (_scale_amplitude != 1.0f) {
+ } else if ((rops & ReadOpsOwnScaling) && _scale_amplitude != 1.0f) {
Session::apply_gain_to_buffer (mixdown_buffer, to_read, _scale_amplitude);
}
-
+
if (!opaque()) {
-
+
/* gack. the things we do for users.
*/
-
+
buf += buf_offset;
-
+
for (nframes_t n = 0; n < to_read; ++n) {
buf[n] += mixdown_buffer[n];
}
}
-
+
return to_read;
}
child->add_property ("default", "yes");
}
+ for (uint32_t n=0; n < master_sources.size(); ++n) {
+ snprintf (buf2, sizeof(buf2), "master-source-%d", n);
+ master_sources[n]->id().print (buf, sizeof (buf));
+ node.add_property (buf2, buf);
+ }
+
if (full && _extra_xml) {
node.add_child_copy (*_extra_xml);
}
Region::set_live_state (node, what_changed, false);
uint32_t old_flags = _flags;
-
+
if ((prop = node.property ("flags")) != 0) {
_flags = Flag (string_2_enum (prop->value(), _flags));
if ((prop = node.property ("scale-gain")) != 0) {
_scale_amplitude = atof (prop->value().c_str());
+ what_changed = Change (what_changed|ScaleAmplitudeChanged);
} else {
_scale_amplitude = 1.0;
}
_fade_in.clear ();
- if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0 || _fade_in.set_state (*child)) {
+ if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0) {
set_default_fade_in ();
- }
+ } else {
+ XMLNode* grandchild = child->child ("AutomationList");
+ if (grandchild) {
+ _fade_in.set_state (*grandchild);
+ }
+ }
+
+ if ((prop = child->property ("active")) != 0) {
+ if (string_is_affirmative (prop->value())) {
+ set_fade_in_active (true);
+ } else {
+ set_fade_in_active (true);
+ }
+ }
} else if (child->name() == "FadeOut") {
_fade_out.clear ();
- if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0 || _fade_out.set_state (*child)) {
+ if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0) {
set_default_fade_out ();
- }
+ } else {
+ XMLNode* grandchild = child->child ("AutomationList");
+ if (grandchild) {
+ _fade_out.set_state (*grandchild);
+ }
+ }
+
+ if ((prop = child->property ("active")) != 0) {
+ if (string_is_affirmative (prop->value())) {
+ set_fade_out_active (true);
+ } else {
+ set_fade_out_active (false);
+ }
+ }
+
}
}
void
AudioRegion::set_fade_in_length (nframes_t len)
{
+ if (len > _length) {
+ len = _length - 1;
+ }
+
bool changed = _fade_in.extend_to (len);
if (changed) {
void
AudioRegion::set_fade_out_length (nframes_t len)
{
+ if (len > _length) {
+ len = _length - 1;
+ }
+
bool changed = _fade_out.extend_to (len);
if (changed) {
_flags = Flag (_flags & ~DefaultFadeOut);
+ send_change (FadeOutChanged);
}
-
- send_change (FadeOutChanged);
}
void
send_change (FadeOutActiveChanged);
}
+bool
+AudioRegion::fade_in_is_default () const
+{
+ return _fade_in_shape == Linear && _fade_in.back()->when == 64;
+}
+
+bool
+AudioRegion::fade_out_is_default () const
+{
+ return _fade_out_shape == Linear && _fade_out.back()->when == 64;
+}
+
void
AudioRegion::set_default_fade_in ()
{
boost::shared_ptr<Region> r = RegionFactory::create (srcs, _start, _length, new_name, _layer, f);
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (r);
- cerr << "new region name is " << ar->name() << endl;
v.push_back (ar);
return names;
}
+void
+AudioRegion::set_master_sources (const SourceList& srcs)
+{
+ master_sources = srcs;
+}
+
bool
AudioRegion::source_equivalent (boost::shared_ptr<const Region> o) const
{
AudioRegion::suspend_fade_in ()
{
if (++_fade_in_disabled == 1) {
- set_fade_in_active (false);
+ if (fade_in_is_default()) {
+ set_fade_in_active (false);
+ }
}
}
void
AudioRegion::resume_fade_in ()
{
- if (_fade_in_disabled && --_fade_in_disabled == 0) {
+ if (--_fade_in_disabled == 0 && _fade_in_disabled) {
set_fade_in_active (true);
}
}
AudioRegion::suspend_fade_out ()
{
if (++_fade_out_disabled == 1) {
- set_fade_out_active (false);
+ if (fade_out_is_default()) {
+ set_fade_out_active (false);
+ }
}
}
void
AudioRegion::resume_fade_out ()
{
- if (_fade_out_disabled && --_fade_out_disabled == 0) {
+ if (--_fade_out_disabled == 0 &&_fade_out_disabled) {
set_fade_out_active (true);
}
}
void
AudioRegion::source_offset_changed ()
{
+ /* XXX this fixes a crash that should not occur. It does occur
+ becauses regions are not being deleted when a session
+ is unloaded. That bug must be fixed.
+ */
+
+ if (sources.empty()) {
+ return;
+ }
+
boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(sources.front());
if (afs && afs->destructive()) {
AudioRegion::set_playlist (boost::weak_ptr<Playlist> wpl)
{
boost::shared_ptr<Playlist> old_playlist = (_playlist.lock());
+
boost::shared_ptr<Playlist> pl (wpl.lock());
if (old_playlist == pl) {
(*i)->remove_playlist (_playlist);
(*i)->add_playlist (pl);
}
+ for (SourceList::const_iterator i = master_sources.begin(); i != master_sources.end(); ++i) {
+ (*i)->remove_playlist (_playlist);
+ (*i)->add_playlist (pl);
+ }
} else {
for (SourceList::const_iterator i = sources.begin(); i != sources.end(); ++i) {
(*i)->add_playlist (pl);
}
+ for (SourceList::const_iterator i = master_sources.begin(); i != master_sources.end(); ++i) {
+ (*i)->add_playlist (pl);
+ }
}
} else {
if (old_playlist) {
for (SourceList::const_iterator i = sources.begin(); i != sources.end(); ++i) {
- (*i)->remove_playlist (_playlist);
+ (*i)->remove_playlist (old_playlist);
+ }
+ for (SourceList::const_iterator i = master_sources.begin(); i != master_sources.end(); ++i) {
+ (*i)->remove_playlist (old_playlist);
}
}
}
}
+int
+AudioRegion::get_transients (AnalysisFeatureList& results, bool force_new)
+{
+ boost::shared_ptr<Playlist> pl = playlist();
+
+ if (!pl) {
+ return -1;
+ }
+
+ if (valid_transients && !force_new) {
+ results = _transients;
+ return 0;
+ }
+
+ SourceList::iterator s;
+
+ for (s = sources.begin() ; s != sources.end(); ++s) {
+ if (!(*s)->has_been_analysed()) {
+ cerr << "For " << name() << " source " << (*s)->name() << " has not been analyzed\n";
+ break;
+ }
+ }
+
+ if (s == sources.end()) {
+ /* all sources are analyzed, merge data from each one */
+
+ for (s = sources.begin() ; s != sources.end(); ++s) {
+
+ /* find the set of transients within the bounds of this region */
+
+ AnalysisFeatureList::iterator low = lower_bound ((*s)->transients.begin(),
+ (*s)->transients.end(),
+ _start);
+
+ AnalysisFeatureList::iterator high = upper_bound ((*s)->transients.begin(),
+ (*s)->transients.end(),
+ _start + _length);
+
+ /* and add them */
+
+ results.insert (results.end(), low, high);
+ }
+
+ TransientDetector::cleanup_transients (results, pl->session().frame_rate(), 3.0);
+
+ /* translate all transients to current position */
+
+ for (AnalysisFeatureList::iterator x = results.begin(); x != results.end(); ++x) {
+ (*x) -= _start;
+ (*x) += _position;
+ }
+
+ _transients = results;
+ valid_transients = true;
+
+ return 0;
+ }
+
+ /* no existing/complete transient info */
+
+ static bool analyse_dialog_shown = false;
+ if (!Config->get_auto_analyse_audio()) {
+ if ( !analyse_dialog_shown ) {
+ pl->session().Dialog (_("\
+You have requested an operation that requires audio analysis.\n\n\
+You currently have \"auto-analyse-audio\" disabled, which means\n\
+that transient data must be generated every time it is required.\n\n\
+If you are doing work that will require transient data on a\n\
+regular basis, you should probably enable \"auto-analyse-audio\"\n\
+then quit ardour and restart.\n\n\
+This dialog will not display again. But you may notice a slight delay\n\
+in this and future transient-detection operations.\n\
+"));
+ analyse_dialog_shown = true; //only show this dialog once
+ }
+ }
+
+ TransientDetector t (pl->session().frame_rate());
+ bool existing_results = !results.empty();
+
+ _transients.clear ();
+ valid_transients = false;
+
+ for (uint32_t i = 0; i < n_channels(); ++i) {
+
+ AnalysisFeatureList these_results;
+
+ t.reset ();
+
+ if (t.run ("", this, i, these_results)) {
+ return -1;
+ }
+
+ /* translate all transients to give absolute position */
+
+ for (AnalysisFeatureList::iterator i = these_results.begin(); i != these_results.end(); ++i) {
+ (*i) += _position;
+ }
+
+ /* merge */
+
+ _transients.insert (_transients.end(), these_results.begin(), these_results.end());
+ }
+
+ if (!results.empty()) {
+ if (existing_results) {
+
+ /* merge our transients into the existing ones, then clean up
+ those.
+ */
+
+ results.insert (results.end(), _transients.begin(), _transients.end());
+ TransientDetector::cleanup_transients (results, pl->session().frame_rate(), 3.0);
+ }
+
+ /* make sure ours are clean too */
+
+ TransientDetector::cleanup_transients (_transients, pl->session().frame_rate(), 3.0);
+
+ } else {
+
+ TransientDetector::cleanup_transients (_transients, pl->session().frame_rate(), 3.0);
+ results = _transients;
+ }
+
+ valid_transients = true;
+
+ return 0;
+}
+
extern "C" {
int region_read_peaks_from_c (void *arg, uint32_t npeaks, uint32_t start, uint32_t cnt, intptr_t data, uint32_t n_chan, double samples_per_unit)