X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Faudioregion.cc;h=d101583aa4b1086d6028243e0a0c8c714b77cc19;hb=3eef81daa23ebf8dffe65f02799c8383385e1128;hp=a4d290ae6d08a03895aa67cb487d7f2f4e9f1662;hpb=a47ec8ba590d1fe663a64a50b02b1f6b61fd5743;p=ardour.git diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index a4d290ae6d..d101583aa4 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -26,7 +26,7 @@ #include -#include +#include #include "pbd/basename.h" #include "pbd/xml++.h" @@ -37,9 +37,9 @@ #include "evoral/Curve.hpp" #include "ardour/audioregion.h" -#include "ardour/debug.h" #include "ardour/session.h" #include "ardour/dB.h" +#include "ardour/debug.h" #include "ardour/playlist.h" #include "ardour/audiofilesource.h" #include "ardour/region_factory.h" @@ -62,6 +62,83 @@ namespace ARDOUR { PBD::PropertyDescriptor fade_in_active; PBD::PropertyDescriptor fade_out_active; PBD::PropertyDescriptor scale_amplitude; + PBD::PropertyDescriptor > fade_in; + PBD::PropertyDescriptor > inverse_fade_in; + PBD::PropertyDescriptor > fade_out; + PBD::PropertyDescriptor > inverse_fade_out; + PBD::PropertyDescriptor > envelope; + } +} + +static const double VERY_SMALL_SIGNAL = 0.0000001; //-140dB + +/* Curve manipulations */ + +static void +reverse_curve (boost::shared_ptr dst, boost::shared_ptr src) +{ + size_t len = src->back()->when; + for (Evoral::ControlList::const_reverse_iterator it = src->rbegin(); it!=src->rend(); it++) { + dst->fast_simple_add (len - (*it)->when, (*it)->value); + } +} + +static void +generate_inverse_power_curve (boost::shared_ptr dst, boost::shared_ptr src) +{ + // calc inverse curve using sum of squares + for (Evoral::ControlList::const_iterator it = src->begin(); it!=src->end(); ++it ) { + float value = (*it)->value; + value = 1 - powf(value,2); + value = sqrtf(value); + dst->fast_simple_add ( (*it)->when, value ); + } +} + +static void +generate_db_fade (boost::shared_ptr dst, double len, int num_steps, float dB_drop) +{ + dst->clear (); + dst->fast_simple_add (0, 1); + + //generate a fade-out curve by successively applying a gain drop + float fade_speed = dB_to_coefficient(dB_drop / (float) num_steps); + for (int i = 1; i < (num_steps-1); i++) { + float coeff = 1.0; + for (int j = 0; j < i; j++) { + coeff *= fade_speed; + } + dst->fast_simple_add (len*(double)i/(double)num_steps, coeff); + } + + dst->fast_simple_add (len, VERY_SMALL_SIGNAL); +} + +static void +merge_curves (boost::shared_ptr dst, + boost::shared_ptr curve1, + boost::shared_ptr curve2) +{ + Evoral::ControlList::EventList::size_type size = curve1->size(); + + //curve lengths must match for now + if (size != curve2->size()) { + return; + } + + Evoral::ControlList::const_iterator c1 = curve1->begin(); + int count = 0; + for (Evoral::ControlList::const_iterator c2 = curve2->begin(); c2!=curve2->end(); c2++ ) { + float v1 = accurate_coefficient_to_dB((*c1)->value); + float v2 = accurate_coefficient_to_dB((*c2)->value); + + double interp = v1 * ( 1.0-( (double)count / (double)size) ); + interp += v2 * ( (double)count / (double)size ); + + interp = dB_to_coefficient(interp); + dst->fast_simple_add ( (*c1)->when, interp ); + c1++; + count++; } } @@ -80,6 +157,16 @@ AudioRegion::make_property_quarks () DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for fade-out-active = %1\n", Properties::fade_out_active.property_id)); Properties::scale_amplitude.property_id = g_quark_from_static_string (X_("scale-amplitude")); DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for scale-amplitude = %1\n", Properties::scale_amplitude.property_id)); + Properties::fade_in.property_id = g_quark_from_static_string (X_("FadeIn")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for FadeIn = %1\n", Properties::fade_in.property_id)); + Properties::inverse_fade_in.property_id = g_quark_from_static_string (X_("InverseFadeIn")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for InverseFadeIn = %1\n", Properties::inverse_fade_in.property_id)); + Properties::fade_out.property_id = g_quark_from_static_string (X_("FadeOut")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for FadeOut = %1\n", Properties::fade_out.property_id)); + Properties::inverse_fade_out.property_id = g_quark_from_static_string (X_("InverseFadeOut")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for InverseFadeOut = %1\n", Properties::inverse_fade_out.property_id)); + Properties::envelope.property_id = g_quark_from_static_string (X_("Envelope")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for Envelope = %1\n", Properties::envelope.property_id)); } void @@ -93,6 +180,11 @@ AudioRegion::register_properties () add_property (_fade_in_active); add_property (_fade_out_active); add_property (_scale_amplitude); + add_property (_fade_in); + add_property (_inverse_fade_in); + add_property (_fade_out); + add_property (_inverse_fade_out); + add_property (_envelope); } #define AUDIOREGION_STATE_DEFAULT \ @@ -101,7 +193,11 @@ AudioRegion::register_properties () , _default_fade_out (Properties::default_fade_out, true) \ , _fade_in_active (Properties::fade_in_active, true) \ , _fade_out_active (Properties::fade_out_active, true) \ - , _scale_amplitude (Properties::scale_amplitude, 1.0) + , _scale_amplitude (Properties::scale_amplitude, 1.0) \ + , _fade_in (Properties::fade_in, boost::shared_ptr (new AutomationList (Evoral::Parameter (FadeInAutomation)))) \ + , _inverse_fade_in (Properties::inverse_fade_in, boost::shared_ptr (new AutomationList (Evoral::Parameter (FadeInAutomation)))) \ + , _fade_out (Properties::fade_out, boost::shared_ptr (new AutomationList (Evoral::Parameter (FadeOutAutomation)))) \ + , _inverse_fade_out (Properties::inverse_fade_out, boost::shared_ptr (new AutomationList (Evoral::Parameter (FadeOutAutomation)))) #define AUDIOREGION_COPY_STATE(other) \ _envelope_active (Properties::envelope_active, other->_envelope_active) \ @@ -109,7 +205,11 @@ AudioRegion::register_properties () , _default_fade_out (Properties::default_fade_out, other->_default_fade_out) \ , _fade_in_active (Properties::fade_in_active, other->_fade_in_active) \ , _fade_out_active (Properties::fade_out_active, other->_fade_out_active) \ - , _scale_amplitude (Properties::scale_amplitude, other->_scale_amplitude) + , _scale_amplitude (Properties::scale_amplitude, other->_scale_amplitude) \ + , _fade_in (Properties::fade_in, boost::shared_ptr (new AutomationList (*other->_fade_in.val()))) \ + , _inverse_fade_in (Properties::fade_in, boost::shared_ptr (new AutomationList (*other->_inverse_fade_in.val()))) \ + , _fade_out (Properties::fade_in, boost::shared_ptr (new AutomationList (*other->_fade_out.val()))) \ + , _inverse_fade_out (Properties::fade_in, boost::shared_ptr (new AutomationList (*other->_inverse_fade_out.val()))) /* a Session will reset these to its chosen defaults by calling AudioRegion::set_default_fade() */ void @@ -131,14 +231,10 @@ AudioRegion::init () AudioRegion::AudioRegion (Session& s, framepos_t start, framecnt_t len, std::string name) : Region (s, start, len, name, DataType::AUDIO) , AUDIOREGION_STATE_DEFAULT + , _envelope (Properties::envelope, boost::shared_ptr (new AutomationList (Evoral::Parameter(EnvelopeAutomation)))) , _automatable (s) - , _fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation))) - , _fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation))) - , _envelope (new AutomationList(Evoral::Parameter(EnvelopeAutomation))) , _fade_in_suspended (0) , _fade_out_suspended (0) - , _fade_in_is_xfade (false) - , _fade_out_is_xfade (false) { init (); assert (_sources.size() == _master_sources.size()); @@ -148,14 +244,10 @@ AudioRegion::AudioRegion (Session& s, framepos_t start, framecnt_t len, std::str AudioRegion::AudioRegion (const SourceList& srcs) : Region (srcs) , AUDIOREGION_STATE_DEFAULT + , _envelope (Properties::envelope, boost::shared_ptr (new AutomationList (Evoral::Parameter(EnvelopeAutomation)))) , _automatable(srcs[0]->session()) - , _fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation))) - , _fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation))) - , _envelope (new AutomationList(Evoral::Parameter(EnvelopeAutomation))) , _fade_in_suspended (0) , _fade_out_suspended (0) - , _fade_in_is_xfade (false) - , _fade_out_is_xfade (false) { init (); assert (_sources.size() == _master_sources.size()); @@ -164,17 +256,13 @@ AudioRegion::AudioRegion (const SourceList& srcs) AudioRegion::AudioRegion (boost::shared_ptr other) : Region (other) , AUDIOREGION_COPY_STATE (other) - , _automatable (other->session()) - , _fade_in (new AutomationList (*other->_fade_in)) - , _fade_out (new AutomationList (*other->_fade_out)) /* As far as I can see, the _envelope's times are relative to region position, and have nothing to do with sources (and hence _start). So when we copy the envelope, we just use the supplied offset. */ - , _envelope (new AutomationList (*other->_envelope, 0, other->_length)) + , _envelope (Properties::envelope, boost::shared_ptr (new AutomationList (*other->_envelope.val(), 0, other->_length))) + , _automatable (other->session()) , _fade_in_suspended (0) , _fade_out_suspended (0) - , _fade_in_is_xfade (false) - , _fade_out_is_xfade (false) { /* don't use init here, because we got fade in/out from the other region */ @@ -190,17 +278,13 @@ AudioRegion::AudioRegion (boost::shared_ptr other) AudioRegion::AudioRegion (boost::shared_ptr other, framecnt_t offset) : Region (other, offset) , AUDIOREGION_COPY_STATE (other) - , _automatable (other->session()) - , _fade_in (new AutomationList (*other->_fade_in)) - , _fade_out (new AutomationList (*other->_fade_out)) /* As far as I can see, the _envelope's times are relative to region position, and have nothing to do with sources (and hence _start). So when we copy the envelope, we just use the supplied offset. */ - , _envelope (new AutomationList (*other->_envelope, offset, other->_length)) + , _envelope (Properties::envelope, boost::shared_ptr (new AutomationList (*other->_envelope.val(), offset, other->_length))) + , _automatable (other->session()) , _fade_in_suspended (0) , _fade_out_suspended (0) - , _fade_in_is_xfade (false) - , _fade_out_is_xfade (false) { /* don't use init here, because we got fade in/out from the other region */ @@ -216,14 +300,10 @@ AudioRegion::AudioRegion (boost::shared_ptr other, framecnt_t AudioRegion::AudioRegion (boost::shared_ptr other, const SourceList& srcs) : Region (boost::static_pointer_cast(other), srcs) , AUDIOREGION_COPY_STATE (other) + , _envelope (Properties::envelope, boost::shared_ptr (new AutomationList (*other->_envelope.val()))) , _automatable (other->session()) - , _fade_in (new AutomationList (*other->_fade_in)) - , _fade_out (new AutomationList (*other->_fade_out)) - , _envelope (new AutomationList (*other->_envelope)) , _fade_in_suspended (0) , _fade_out_suspended (0) - , _fade_in_is_xfade (false) - , _fade_out_is_xfade (false) { /* make-a-sort-of-copy-with-different-sources constructor (used by audio filter) */ @@ -239,14 +319,10 @@ AudioRegion::AudioRegion (boost::shared_ptr other, const Sour AudioRegion::AudioRegion (SourceList& srcs) : Region (srcs) , AUDIOREGION_STATE_DEFAULT + , _envelope (Properties::envelope, boost::shared_ptr (new AutomationList(Evoral::Parameter(EnvelopeAutomation)))) , _automatable(srcs[0]->session()) - , _fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation))) - , _fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation))) - , _envelope (new AutomationList(Evoral::Parameter(EnvelopeAutomation))) , _fade_in_suspended (0) , _fade_out_suspended (0) - , _fade_in_is_xfade (false) - , _fade_out_is_xfade (false) { init (); @@ -366,7 +442,7 @@ AudioRegion::read (Sample* buf, framepos_t pos, framecnt_t cnt, int channel) con } framecnt_t -AudioRegion::master_read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, +AudioRegion::master_read_at (Sample *buf, Sample* /*mixdown_buffer*/, float* /*gain_buffer*/, framepos_t position, framecnt_t cnt, uint32_t chan_n) const { /* do not read gain/scaling/fades and do not count this disk i/o in statistics */ @@ -405,11 +481,6 @@ AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, return 0; } - if (muted()) { - return 0; /* read nothing */ - } - - /* WORK OUT WHERE TO GET DATA FROM */ framecnt_t to_read; @@ -428,7 +499,7 @@ AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, /* COMPUTE DETAILS OF ANY FADES INVOLVED IN THIS READ */ - /* Amount of fade in that we are dealing with in this read */ + /* Amount (length) of fade in that we are dealing with in this read */ framecnt_t fade_in_limit = 0; /* Offset from buf / mixdown_buffer of the start @@ -436,7 +507,7 @@ AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, */ frameoffset_t fade_out_offset = 0; - /* Amount of fade in that we are dealing with in this read */ + /* Amount (length) of fade out that we are dealing with in this read */ framecnt_t fade_out_limit = 0; framecnt_t fade_interval_start = 0; @@ -446,7 +517,7 @@ AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, if (_fade_in_active && _session.config.get_use_region_fades()) { framecnt_t fade_in_length = (framecnt_t) _fade_in->back()->when; - + /* see if this read is within the fade in */ if (internal_offset < fade_in_length) { @@ -489,8 +560,8 @@ AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, /* READ DATA FROM THE SOURCE INTO mixdown_buffer. We can never read directly into buf, since it may contain data - from a transparent region `below' this one in the stack; we - must always mix. + from a region `below' this one in the stack, and our fades (if they exist) + may need to mix with the existing data. */ if (read_from_sources (_sources, _length, mixdown_buffer, position, to_read, chan_n) != to_read) { @@ -515,7 +586,6 @@ AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, apply_gain_to_buffer (mixdown_buffer, to_read, _scale_amplitude); } - /* APPLY FADES TO THE DATA IN mixdown_buffer AND MIX THE RESULTS INTO * buf. The key things to realize here: (1) the fade being applied is * (as of April 26th 2012) just the inverse of the fade in curve (2) @@ -524,34 +594,39 @@ AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, */ if (fade_in_limit != 0) { - if (_inverse_fade_in) { - - /* explicit inverse fade in curve (e.g. for constant - * power), so we have to fetch it. - */ - _inverse_fade_in->curve().get_vector (internal_offset, internal_offset + fade_in_limit, gain_buffer, fade_in_limit); - - /* Fade the data from lower layers out */ - for (framecnt_t n = 0; n < fade_in_limit; ++n) { - buf[n] *= gain_buffer[n]; + if (opaque()) { + if (_inverse_fade_in) { + + /* explicit inverse fade in curve (e.g. for constant + * power), so we have to fetch it. + */ + + _inverse_fade_in->curve().get_vector (internal_offset, internal_offset + fade_in_limit, gain_buffer, fade_in_limit); + + /* Fade the data from lower layers out */ + for (framecnt_t n = 0; n < fade_in_limit; ++n) { + buf[n] *= gain_buffer[n]; + } + + /* refill gain buffer with the fade in */ + + _fade_in->curve().get_vector (internal_offset, internal_offset + fade_in_limit, gain_buffer, fade_in_limit); + + } else { + + /* no explicit inverse fade in, so just use (1 - fade + * in) for the fade out of lower layers + */ + + _fade_in->curve().get_vector (internal_offset, internal_offset + fade_in_limit, gain_buffer, fade_in_limit); + + for (framecnt_t n = 0; n < fade_in_limit; ++n) { + buf[n] *= 1 - gain_buffer[n]; + } } - - /* refill gain buffer with the fade in */ - - _fade_in->curve().get_vector (internal_offset, internal_offset + fade_in_limit, gain_buffer, fade_in_limit); - } else { - - /* no explicit inverse fade in, so just use (1 - fade - * in) for the fade out of lower layers - */ - _fade_in->curve().get_vector (internal_offset, internal_offset + fade_in_limit, gain_buffer, fade_in_limit); - - for (framecnt_t n = 0; n < fade_in_limit; ++n) { - buf[n] *= 1 - gain_buffer[n]; - } } /* Mix our newly-read data in, with the fade */ @@ -564,42 +639,57 @@ AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, framecnt_t const curve_offset = fade_interval_start - (_length - _fade_out->back()->when); - if (_inverse_fade_out) { + if (opaque()) { + if (_inverse_fade_out) { + + _inverse_fade_out->curve().get_vector (curve_offset, curve_offset + fade_out_limit, gain_buffer, fade_out_limit); + + /* Fade the data from lower levels in */ + for (framecnt_t n = 0, m = fade_out_offset; n < fade_out_limit; ++n, ++m) { + buf[m] *= gain_buffer[n]; + } + + /* fetch the actual fade out */ - _inverse_fade_out->curve().get_vector (curve_offset, curve_offset + fade_out_limit, gain_buffer, fade_out_limit); + _fade_out->curve().get_vector (curve_offset, curve_offset + fade_out_limit, gain_buffer, fade_out_limit); + + } else { - /* Fade the data from lower levels out */ - for (framecnt_t n = 0, m = fade_out_offset; n < fade_out_limit; ++n, ++m) { - buf[m] *= gain_buffer[n]; + /* no explicit inverse fade out (which is + * actually a fade in), so just use (1 - fade + * out) for the fade in of lower layers + */ + + _fade_out->curve().get_vector (curve_offset, curve_offset + fade_out_limit, gain_buffer, fade_out_limit); + + for (framecnt_t n = 0, m = fade_out_offset; n < fade_out_limit; ++n, ++m) { + buf[m] *= 1 - gain_buffer[n]; + } } - - /* fetch the actual fade out */ - - _fade_out->curve().get_vector (curve_offset, curve_offset + fade_out_limit, gain_buffer, fade_out_limit); - } else { - - /* no explicit inverse fade out, so just use (1 - fade - * out) for the fade in of lower layers - */ - _fade_out->curve().get_vector (curve_offset, curve_offset + fade_out_limit, gain_buffer, fade_out_limit); - - for (framecnt_t n = 0, m = fade_out_offset; n < fade_out_limit; ++n, ++m) { - buf[m] *= 1 - gain_buffer[n]; - } } - /* Mix our newly-read data out, with the fade */ + /* Mix our newly-read data with whatever was already there, + with the fade out applied to our data. + */ for (framecnt_t n = 0, m = fade_out_offset; n < fade_out_limit; ++n, ++m) { buf[m] += mixdown_buffer[m] * gain_buffer[n]; } } - - /* MIX THE REGION BODY FROM mixdown_buffer INTO buf */ - - mix_buffers_no_gain (buf + fade_in_limit, mixdown_buffer + fade_in_limit, to_read - fade_in_limit - fade_out_limit); + /* MIX OR COPY THE REGION BODY FROM mixdown_buffer INTO buf */ + + framecnt_t const N = to_read - fade_in_limit - fade_out_limit; + if (N > 0) { + if (opaque ()) { + DEBUG_TRACE (DEBUG::AudioPlayback, string_compose ("Region %1 memcpy into buf @ %2 + %3, from mixdown buffer @ %4 + %5, len = %6 cnt was %7\n", + name(), buf, fade_in_limit, mixdown_buffer, fade_in_limit, N, cnt)); + memcpy (buf + fade_in_limit, mixdown_buffer + fade_in_limit, N * sizeof (Sample)); + } else { + mix_buffers_no_gain (buf + fade_in_limit, mixdown_buffer + fade_in_limit, N); + } + } return to_read; } @@ -643,8 +733,8 @@ AudioRegion::read_from_sources (SourceList const & srcs, framecnt_t limit, Sampl */ if (Config->get_replicate_missing_region_channels()) { - /* track is N-channel, this region has less channels, so use a relevant channel - */ + + /* copy an existing channel's data in for this non-existant one */ uint32_t channel = n_channels() % chan_n; boost::shared_ptr src = boost::dynamic_pointer_cast (srcs[channel]); @@ -652,6 +742,11 @@ AudioRegion::read_from_sources (SourceList const & srcs, framecnt_t limit, Sampl if (src->read (buf, _start + internal_offset, to_read) != to_read) { return 0; /* "read nothing" */ } + + } else { + + /* use silence */ + memset (buf, 0, sizeof (Sample) * to_read); } } @@ -659,17 +754,24 @@ AudioRegion::read_from_sources (SourceList const & srcs, framecnt_t limit, Sampl } XMLNode& -AudioRegion::state () +AudioRegion::get_basic_state () { XMLNode& node (Region::state ()); - XMLNode *child; char buf[64]; LocaleGuard lg (X_("POSIX")); snprintf (buf, sizeof (buf), "%u", (uint32_t) _sources.size()); node.add_property ("channels", buf); - Stateful::add_properties (node); + return node; +} + +XMLNode& +AudioRegion::state () +{ + XMLNode& node (get_basic_state()); + XMLNode *child; + LocaleGuard lg (X_("POSIX")); child = node.add_child ("Envelope"); @@ -700,6 +802,11 @@ AudioRegion::state () child->add_child_nocopy (_fade_in->get_state ()); } + if (_inverse_fade_in) { + child = node.add_child (X_("InverseFadeIn")); + child->add_child_nocopy (_inverse_fade_in->get_state ()); + } + child = node.add_child (X_("FadeOut")); if (_default_fade_out) { @@ -708,6 +815,11 @@ AudioRegion::state () child->add_child_nocopy (_fade_out->get_state ()); } + if (_inverse_fade_out) { + child = node.add_child (X_("InverseFadeOut")); + child->add_child_nocopy (_inverse_fade_out->get_state ()); + } + return node; } @@ -765,7 +877,7 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_ _fade_in->clear (); - if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0) { + if (((prop = child->property ("default")) != 0 && string_is_affirmative (prop->value())) || (prop = child->property ("steepness")) != 0) { set_default_fade_in (); } else { XMLNode* grandchild = child->child ("AutomationList"); @@ -786,7 +898,7 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_ _fade_out->clear (); - if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0) { + if (((prop = child->property ("default")) != 0 && (string_is_affirmative (prop->value()))) || (prop = child->property ("steepness")) != 0) { set_default_fade_out (); } else { XMLNode* grandchild = child->child ("AutomationList"); @@ -794,7 +906,7 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_ _fade_out->set_state (*grandchild, version); } } - + if ((prop = child->property ("active")) != 0) { if (string_is_affirmative (prop->value())) { set_fade_out_active (true); @@ -802,7 +914,17 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_ set_fade_out_active (false); } } - + + } else if (child->name() == "InverseFadeIn") { + XMLNode* grandchild = child->child ("AutomationList"); + if (grandchild) { + _inverse_fade_in->set_state (*grandchild, version); + } + } else if (child->name() == "InverseFadeOut") { + XMLNode* grandchild = child->child ("AutomationList"); + if (grandchild) { + _inverse_fade_out->set_state (*grandchild, version); + } } } @@ -843,8 +965,9 @@ void AudioRegion::set_fade_in (boost::shared_ptr f) { _fade_in->freeze (); - *_fade_in = *f; + *(_fade_in.val()) = *f; _fade_in->thaw (); + _default_fade_in = false; send_change (PropertyChange (Properties::fade_in)); } @@ -852,114 +975,68 @@ AudioRegion::set_fade_in (boost::shared_ptr f) void AudioRegion::set_fade_in (FadeShape shape, framecnt_t len) { + boost::shared_ptr c1 (new Evoral::ControlList (FadeInAutomation)); + boost::shared_ptr c2 (new Evoral::ControlList (FadeInAutomation)); + boost::shared_ptr c3 (new Evoral::ControlList (FadeInAutomation)); + _fade_in->freeze (); _fade_in->clear (); + _inverse_fade_in->clear (); switch (shape) { case FadeLinear: _fade_in->fast_simple_add (0.0, 0.0); _fade_in->fast_simple_add (len, 1.0); - _inverse_fade_in.reset (); + reverse_curve (_inverse_fade_in.val(), _fade_in.val()); break; case FadeFast: - _fade_in->fast_simple_add (0, 0); - _fade_in->fast_simple_add (len * 0.389401, 0.0333333); - _fade_in->fast_simple_add (len * 0.629032, 0.0861111); - _fade_in->fast_simple_add (len * 0.829493, 0.233333); - _fade_in->fast_simple_add (len * 0.9447, 0.483333); - _fade_in->fast_simple_add (len * 0.976959, 0.697222); - _fade_in->fast_simple_add (len, 1); - _inverse_fade_in.reset (); + generate_db_fade (_fade_in.val(), len, 10, -60); + reverse_curve (c1, _fade_in.val()); + _fade_in->copy_events (*c1); + generate_inverse_power_curve (_inverse_fade_in.val(), _fade_in.val()); break; case FadeSlow: - _fade_in->fast_simple_add (0, 0); - _fade_in->fast_simple_add (len * 0.0207373, 0.197222); - _fade_in->fast_simple_add (len * 0.0645161, 0.525); - _fade_in->fast_simple_add (len * 0.152074, 0.802778); - _fade_in->fast_simple_add (len * 0.276498, 0.919444); - _fade_in->fast_simple_add (len * 0.481567, 0.980556); - _fade_in->fast_simple_add (len * 0.767281, 1); - _fade_in->fast_simple_add (len, 1); - _inverse_fade_in.reset (); - break; - - case FadeLogA: - _fade_in->fast_simple_add (0, 0); - _fade_in->fast_simple_add (len * 0.0737327, 0.308333); - _fade_in->fast_simple_add (len * 0.246544, 0.658333); - _fade_in->fast_simple_add (len * 0.470046, 0.886111); - _fade_in->fast_simple_add (len * 0.652074, 0.972222); - _fade_in->fast_simple_add (len * 0.771889, 0.988889); - _fade_in->fast_simple_add (len, 1); - _inverse_fade_in.reset (); - break; - - case FadeLogB: - _fade_in->fast_simple_add (0, 0); - _fade_in->fast_simple_add (len * 0.304147, 0.0694444); - _fade_in->fast_simple_add (len * 0.529954, 0.152778); - _fade_in->fast_simple_add (len * 0.725806, 0.333333); - _fade_in->fast_simple_add (len * 0.847926, 0.558333); - _fade_in->fast_simple_add (len * 0.919355, 0.730556); - _fade_in->fast_simple_add (len, 1); - _inverse_fade_in.reset (); + generate_db_fade (c1, len, 10, -1); // start off with a slow fade + generate_db_fade (c2, len, 10, -80); // end with a fast fade + merge_curves (_fade_in.val(), c1, c2); + reverse_curve (c3, _fade_in.val()); + _fade_in->copy_events (*c3); + generate_inverse_power_curve (_inverse_fade_in.val(), _fade_in.val()); break; - case FadeConstantPowerMinus3dB: - _fade_in->fast_simple_add (0.0, 0.0); - _fade_in->fast_simple_add ((len * 0.166667), 0.282192); - _fade_in->fast_simple_add ((len * 0.333333), 0.518174); - _fade_in->fast_simple_add ((len * 0.500000), 0.707946); - _fade_in->fast_simple_add ((len * 0.666667), 0.851507); - _fade_in->fast_simple_add ((len * 0.833333), 0.948859); - _fade_in->fast_simple_add (len, 1.0); - - /* setup complementary fade out for lower layers */ - - if (!_inverse_fade_in) { - _inverse_fade_in.reset (new AutomationList (Evoral::Parameter (FadeInAutomation))); + case FadeConstantPower: + for (int i = 0; i < 9; ++i) { + float dist = (float) i / 10.0f; + _fade_in->fast_simple_add (len*dist, sin (dist*M_PI/2)); } - - _inverse_fade_in->clear (); - _inverse_fade_in->fast_simple_add (0.0, 1.0); - _inverse_fade_in->fast_simple_add ((len * 0.166667), 0.948859); - _inverse_fade_in->fast_simple_add ((len * 0.333333), 0.851507); - _inverse_fade_in->fast_simple_add ((len * 0.500000), 0.707946); - _inverse_fade_in->fast_simple_add ((len * 0.666667), 0.518174); - _inverse_fade_in->fast_simple_add ((len * 0.833333), 0.282192); - _inverse_fade_in->fast_simple_add (len, 0.0); - + _fade_in->fast_simple_add (len, 1.0); + reverse_curve (_inverse_fade_in.val(), _fade_in.val()); break; - case FadeConstantPowerMinus6dB: - _fade_in->fast_simple_add (0.0, 0.0); - _fade_in->fast_simple_add ((len * 0.166667), 0.166366); - _fade_in->fast_simple_add ((len * 0.333333), 0.332853); - _fade_in->fast_simple_add ((len * 0.500000), 0.499459); - _fade_in->fast_simple_add ((len * 0.666667), 0.666186); - _fade_in->fast_simple_add ((len * 0.833333), 0.833033); - _fade_in->fast_simple_add (len, 1.0); - - /* setup complementary fade out for lower layers */ - - if (!_inverse_fade_in) { - _inverse_fade_in.reset (new AutomationList (Evoral::Parameter (FadeInAutomation))); + case FadeSymmetric: + //start with a nearly linear cuve + _fade_in->fast_simple_add (0, 1); + _fade_in->fast_simple_add (0.5*len, 0.6); + //now generate a fade-out curve by successively applying a gain drop + const float breakpoint = 0.7; //linear for first 70% + const int num_steps = 9; + for (int i = 2; i < num_steps; i++) { + float coeff = (1.0-breakpoint); + for (int j = 0; j < i; j++) { + coeff *= 0.5; //6dB drop per step + } + _fade_in->fast_simple_add (len* (breakpoint+((1.0-breakpoint)*(double)i/(double)num_steps)), coeff); } - - _inverse_fade_in->clear (); - _inverse_fade_in->fast_simple_add (0.0, 1.0); - _inverse_fade_in->fast_simple_add ((len * 0.166667), 0.833033); - _inverse_fade_in->fast_simple_add ((len * 0.333333), 0.666186); - _inverse_fade_in->fast_simple_add ((len * 0.500000), 0.499459); - _inverse_fade_in->fast_simple_add ((len * 0.666667), 0.332853); - _inverse_fade_in->fast_simple_add ((len * 0.833333), 0.166366); - _inverse_fade_in->fast_simple_add (len, 0.0); - + _fade_in->fast_simple_add (len, VERY_SMALL_SIGNAL); + reverse_curve (c3, _fade_in.val()); + _fade_in->copy_events (*c3); + reverse_curve (_inverse_fade_in.val(), _fade_in.val()); break; } + _default_fade_in = false; _fade_in->thaw (); send_change (PropertyChange (Properties::fade_in)); } @@ -968,8 +1045,9 @@ void AudioRegion::set_fade_out (boost::shared_ptr f) { _fade_out->freeze (); - *_fade_out = *f; + *(_fade_out.val()) = *f; _fade_out->thaw (); + _default_fade_out = false; send_change (PropertyChange (Properties::fade_in)); } @@ -977,114 +1055,67 @@ AudioRegion::set_fade_out (boost::shared_ptr f) void AudioRegion::set_fade_out (FadeShape shape, framecnt_t len) { + boost::shared_ptr c1 (new Evoral::ControlList (FadeOutAutomation)); + boost::shared_ptr c2 (new Evoral::ControlList (FadeOutAutomation)); + _fade_out->freeze (); _fade_out->clear (); + _inverse_fade_out->clear (); switch (shape) { - case FadeFast: - _fade_out->fast_simple_add (0.0, 1.0); - _fade_out->fast_simple_add (len * 0.023041, 0.697222); - _fade_out->fast_simple_add (len * 0.0553, 0.483333); - _fade_out->fast_simple_add (len * 0.170507, 0.233333); - _fade_out->fast_simple_add (len * 0.370968, 0.0861111); - _fade_out->fast_simple_add (len * 0.610599, 0.0333333); - _fade_out->fast_simple_add (1.0, 0.0); - _inverse_fade_out.reset (); - break; - - case FadeLogA: - _fade_out->fast_simple_add (0, 1.0); - _fade_out->fast_simple_add (len * 0.228111, 0.988889); - _fade_out->fast_simple_add (len * 0.347926, 0.972222); - _fade_out->fast_simple_add (len * 0.529954, 0.886111); - _fade_out->fast_simple_add (len * 0.753456, 0.658333); - _fade_out->fast_simple_add (len * 0.9262673, 0.308333); - _fade_out->fast_simple_add (len, 0.0); - _inverse_fade_out.reset (); - break; - - case FadeSlow: + case FadeLinear: _fade_out->fast_simple_add (0.0, 1.0); - _fade_out->fast_simple_add (len * 0.305556, 1); - _fade_out->fast_simple_add (len * 0.548611, 0.991736); - _fade_out->fast_simple_add (len * 0.759259, 0.931129); - _fade_out->fast_simple_add (len * 0.918981, 0.68595); - _fade_out->fast_simple_add (len * 0.976852, 0.22865); - _fade_out->fast_simple_add (len, 0.0); - _inverse_fade_out.reset (); + _fade_out->fast_simple_add (len, VERY_SMALL_SIGNAL); + reverse_curve (_inverse_fade_out.val(), _fade_out.val()); break; - - case FadeLogB: - _fade_out->fast_simple_add (0.0, 1.0); - _fade_out->fast_simple_add (len * 0.080645, 0.730556); - _fade_out->fast_simple_add (len * 0.277778, 0.289256); - _fade_out->fast_simple_add (len * 0.470046, 0.152778); - _fade_out->fast_simple_add (len * 0.695853, 0.0694444); - _fade_out->fast_simple_add (len, 0.0); - _inverse_fade_out.reset (); + + case FadeFast: + generate_db_fade (_fade_out.val(), len, 10, -60); + generate_inverse_power_curve (_inverse_fade_out.val(), _fade_out.val()); break; - - case FadeLinear: - _fade_out->fast_simple_add (0.0, 1.0); - _fade_out->fast_simple_add (len, 0.0); - _inverse_fade_out.reset (); + + case FadeSlow: + generate_db_fade (c1, len, 10, -1); //start off with a slow fade + generate_db_fade (c2, len, 10, -80); //end with a fast fade + merge_curves (_fade_out.val(), c1, c2); + generate_inverse_power_curve (_inverse_fade_out.val(), _fade_out.val()); break; - case FadeConstantPowerMinus3dB: + case FadeConstantPower: + //constant-power fades use a sin/cos relationship + //the cutoff is abrupt but it has the benefit of being symmetrical _fade_out->fast_simple_add (0.0, 1.0); - _fade_out->fast_simple_add ((len * 0.166667), 0.948859); - _fade_out->fast_simple_add ((len * 0.333333), 0.851507); - _fade_out->fast_simple_add ((len * 0.500000), 0.707946); - _fade_out->fast_simple_add ((len * 0.666667), 0.518174); - _fade_out->fast_simple_add ((len * 0.833333), 0.282192); - _fade_out->fast_simple_add (len, 0.0); - - /* setup complementary fade in for lower layers */ - - if (!_inverse_fade_out) { - _inverse_fade_out.reset (new AutomationList (Evoral::Parameter (FadeOutAutomation))); + for (int i = 1; i < 9; i++ ) { + float dist = (float)i/10.0; + _fade_out->fast_simple_add ((len * dist), cos(dist*M_PI/2)); } - - _inverse_fade_out->clear (); - _inverse_fade_out->fast_simple_add (0.0, 0.0); - _inverse_fade_out->fast_simple_add ((len * 0.166667), 0.282192); - _inverse_fade_out->fast_simple_add ((len * 0.333333), 0.518174); - _inverse_fade_out->fast_simple_add ((len * 0.500000), 0.707946); - _inverse_fade_out->fast_simple_add ((len * 0.666667), 0.851507); - _inverse_fade_out->fast_simple_add ((len * 0.833333), 0.948859); - _inverse_fade_out->fast_simple_add (len, 1.0); - + _fade_out->fast_simple_add (len, VERY_SMALL_SIGNAL); + reverse_curve (_inverse_fade_out.val(), _fade_out.val()); break; - - case FadeConstantPowerMinus6dB: - _fade_out->fast_simple_add (0.0, 1.0); - _fade_out->fast_simple_add ((len * 0.166667), 0.833033); - _fade_out->fast_simple_add ((len * 0.333333), 0.666186); - _fade_out->fast_simple_add ((len * 0.500000), 0.499459); - _fade_out->fast_simple_add ((len * 0.666667), 0.332853); - _fade_out->fast_simple_add ((len * 0.833333), 0.166366); - _fade_out->fast_simple_add (len, 0.0); - - /* setup complementary fade in for lower layers */ - - if (!_inverse_fade_out) { - _inverse_fade_out.reset (new AutomationList (Evoral::Parameter (FadeOutAutomation))); + + case FadeSymmetric: + //start with a nearly linear cuve + _fade_out->fast_simple_add (0, 1); + _fade_out->fast_simple_add (0.5*len, 0.6); + + //now generate a fade-out curve by successively applying a gain drop + const float breakpoint = 0.7; //linear for first 70% + const int num_steps = 9; + for (int i = 2; i < num_steps; i++) { + float coeff = (1.0-breakpoint); + for (int j = 0; j < i; j++) { + coeff *= 0.5; //6dB drop per step + } + _fade_out->fast_simple_add (len* (breakpoint+((1.0-breakpoint)*(double)i/(double)num_steps)), coeff); } - - _inverse_fade_out->clear (); - _inverse_fade_out->fast_simple_add (0.0, 0.0); - _inverse_fade_out->fast_simple_add ((len * 0.166667), 0.166366); - _inverse_fade_out->fast_simple_add ((len * 0.333333), 0.332853); - _inverse_fade_out->fast_simple_add ((len * 0.500000), 0.499459); - _inverse_fade_out->fast_simple_add ((len * 0.666667), 0.666186); - _inverse_fade_out->fast_simple_add ((len * 0.833333), 0.833033); - _inverse_fade_out->fast_simple_add (len, 1.0); - + _fade_out->fast_simple_add (len, VERY_SMALL_SIGNAL); + reverse_curve (_inverse_fade_out.val(), _fade_out.val()); break; } + _default_fade_out = false; _fade_out->thaw (); - send_change (PropertyChange (Properties::fade_in)); + send_change (PropertyChange (Properties::fade_out)); } void @@ -1093,10 +1124,18 @@ AudioRegion::set_fade_in_length (framecnt_t len) if (len > _length) { len = _length - 1; } + + if (len < 64) { + len = 64; + } bool changed = _fade_in->extend_to (len); if (changed) { + if (_inverse_fade_in) { + _inverse_fade_in->extend_to (len); + } + _default_fade_in = false; send_change (PropertyChange (Properties::fade_in)); } @@ -1109,10 +1148,19 @@ AudioRegion::set_fade_out_length (framecnt_t len) len = _length - 1; } + if (len < 64) { + len = 64; + } + bool changed = _fade_out->extend_to (len); if (changed) { + + if (_inverse_fade_out) { + _inverse_fade_out->extend_to (len); + } _default_fade_out = false; + send_change (PropertyChange (Properties::fade_out)); } } @@ -1154,7 +1202,6 @@ void AudioRegion::set_default_fade_in () { _fade_in_suspended = 0; - _fade_in_is_xfade = false; set_fade_in (FadeLinear, 64); } @@ -1162,7 +1209,6 @@ void AudioRegion::set_default_fade_out () { _fade_out_suspended = 0; - _fade_out_is_xfade = false; set_fade_out (FadeLinear, 64); } @@ -1728,19 +1774,82 @@ AudioRegion::find_silence (Sample threshold, framecnt_t min_length, InterThreadI Evoral::Range AudioRegion::body_range () const { - return Evoral::Range (first_frame() + _fade_in->back()->when, last_frame() - _fade_out->back()->when); + return Evoral::Range (first_frame() + _fade_in->back()->when + 1, last_frame() - _fade_out->back()->when); } -void -AudioRegion::set_fade_in_is_xfade (bool yn) +boost::shared_ptr +AudioRegion::get_single_other_xfade_region (bool start) const { - _fade_in_is_xfade = yn; + boost::shared_ptr pl (playlist()); + + if (!pl) { + /* not currently in a playlist - xfade length is unbounded + (and irrelevant) + */ + return boost::shared_ptr (); + } + + boost::shared_ptr rl; + + if (start) { + rl = pl->regions_at (position()); + } else { + rl = pl->regions_at (last_frame()); + } + + RegionList::iterator i; + boost::shared_ptr other; + uint32_t n = 0; + + /* count and find the other region in a single pass through the list */ + + for (i = rl->begin(); i != rl->end(); ++i) { + if ((*i).get() != this) { + other = *i; + } + ++n; + } + + if (n != 2) { + /* zero or multiple regions stacked here - don't care about xfades */ + return boost::shared_ptr (); + } + + return other; } -void -AudioRegion::set_fade_out_is_xfade (bool yn) +framecnt_t +AudioRegion::verify_xfade_bounds (framecnt_t len, bool start) { - _fade_out_is_xfade = yn; + /* this is called from a UI to check on whether a new proposed + length for an xfade is legal or not. it returns the legal + length corresponding to @a len which may be shorter than or + equal to @a len itself. + */ + + boost::shared_ptr other = get_single_other_xfade_region (start); + framecnt_t maxlen; + + if (!other) { + /* zero or > 2 regions here, don't care about len, but + it can't be longer than the region itself. + */ + return min (length(), len); + } + + /* we overlap a single region. clamp the length of an xfade to + the maximum possible duration of the overlap (if the other + region were trimmed appropriately). + */ + + if (start) { + maxlen = other->latest_possible_frame() - position(); + } else { + maxlen = last_frame() - other->earliest_possible_position(); + } + + return min (length(), min (maxlen, len)); + } extern "C" {