#include "evoral/Curve.hpp"
#include "ardour/audioregion.h"
-#include "ardour/debug.h"
#include "ardour/session.h"
#include "ardour/dB.h"
#include "ardour/playlist.h"
PBD::PropertyDescriptor<bool> fade_in_active;
PBD::PropertyDescriptor<bool> fade_out_active;
PBD::PropertyDescriptor<float> scale_amplitude;
+ PBD::PropertyDescriptor<bool> fade_out_is_xfade;
+ PBD::PropertyDescriptor<bool> fade_out_is_short;
+ PBD::PropertyDescriptor<bool> fade_in_is_xfade;
+ PBD::PropertyDescriptor<bool> fade_in_is_short;
+ }
+}
+
+static const double VERY_SMALL_SIGNAL = 0.0000001; //-140dB
+
+/* Curve manipulations */
+
+static void
+reverse_curve (boost::shared_ptr<Evoral::ControlList> dst, boost::shared_ptr<const Evoral::ControlList> src)
+{
+ size_t len = src->back()->when;
+
+ for (Evoral::ControlList::const_iterator it = src->begin(); it!=src->end(); it++) {
+ dst->add (len - (*it)->when, (*it)->value);
+ }
+}
+
+static void
+generate_inverse_power_curve (boost::shared_ptr<Evoral::ControlList> dst, boost::shared_ptr<const Evoral::ControlList> 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<Evoral::ControlList> 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<Evoral::ControlList> dst,
+ boost::shared_ptr<const Evoral::ControlList> curve1,
+ boost::shared_ptr<const Evoral::ControlList> 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->add ( (*c1)->when, interp );
+ c1++;
+ count++;
}
}
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_out_is_xfade.property_id = g_quark_from_static_string (X_("fade-out-is-xfade"));
+ DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for fade-out-is-xfade = %1\n", Properties::fade_out_is_xfade.property_id));
+ Properties::fade_out_is_short.property_id = g_quark_from_static_string (X_("fade-out-is-short"));
+ DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for fade-out-is-short = %1\n", Properties::fade_out_is_short.property_id));
+ Properties::fade_in_is_xfade.property_id = g_quark_from_static_string (X_("fade-in-is-xfade"));
+ DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for fade-in-is-xfade = %1\n", Properties::fade_in_is_xfade.property_id));
+ Properties::fade_in_is_short.property_id = g_quark_from_static_string (X_("fade-in-is-short"));
+ DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for fade-in-is-short = %1\n", Properties::fade_in_is_short.property_id));
}
void
add_property (_fade_in_active);
add_property (_fade_out_active);
add_property (_scale_amplitude);
+ add_property (_fade_out_is_xfade);
+ add_property (_fade_out_is_short);
+ add_property (_fade_in_is_xfade);
+ add_property (_fade_in_is_short);
}
#define AUDIOREGION_STATE_DEFAULT \
, _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_is_xfade (Properties::fade_in_is_xfade, false) \
+ , _fade_out_is_xfade (Properties::fade_out_is_xfade, false) \
+ , _fade_in_is_short (Properties::fade_in_is_short, false) \
+ , _fade_out_is_short (Properties::fade_out_is_short, false)
#define AUDIOREGION_COPY_STATE(other) \
_envelope_active (Properties::envelope_active, other->_envelope_active) \
, _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_is_xfade (Properties::fade_in_is_xfade, other->_fade_in_is_xfade) \
+ , _fade_out_is_xfade (Properties::fade_out_is_xfade, other->_fade_out_is_xfade) \
+ , _fade_in_is_short (Properties::fade_in_is_short, other->_fade_in_is_short) \
+ , _fade_out_is_short (Properties::fade_out_is_short, other->_fade_out_is_short)
/* a Session will reset these to its chosen defaults by calling AudioRegion::set_default_fade() */
void
, AUDIOREGION_STATE_DEFAULT
, _automatable (s)
, _fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation)))
+ , _inverse_fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation)))
, _fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation)))
+ , _inverse_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());
, AUDIOREGION_STATE_DEFAULT
, _automatable(srcs[0]->session())
, _fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation)))
+ , _inverse_fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation)))
, _fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation)))
+ , _inverse_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());
, AUDIOREGION_COPY_STATE (other)
, _automatable (other->session())
, _fade_in (new AutomationList (*other->_fade_in))
+ , _inverse_fade_in (new AutomationList(*other->_inverse_fade_in))
, _fade_out (new AutomationList (*other->_fade_out))
+ , _inverse_fade_out (new AutomationList (*other->_inverse_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))
, _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
*/
, AUDIOREGION_COPY_STATE (other)
, _automatable (other->session())
, _fade_in (new AutomationList (*other->_fade_in))
+ , _inverse_fade_in (new AutomationList(*other->_inverse_fade_in))
, _fade_out (new AutomationList (*other->_fade_out))
+ , _inverse_fade_out (new AutomationList (*other->_inverse_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))
, _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
*/
, AUDIOREGION_COPY_STATE (other)
, _automatable (other->session())
, _fade_in (new AutomationList (*other->_fade_in))
+ , _inverse_fade_in (new AutomationList(*other->_inverse_fade_in))
, _fade_out (new AutomationList (*other->_fade_out))
+ , _inverse_fade_out (new AutomationList (*other->_inverse_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) */
, AUDIOREGION_STATE_DEFAULT
, _automatable(srcs[0]->session())
, _fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation)))
+ , _inverse_fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation)))
, _fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation)))
+ , _inverse_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 ();
}
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 */
/* 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) {
*/
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 */
for (framecnt_t n = 0; n < fade_in_limit; ++n) {
buf[n] += mixdown_buffer[n] * gain_buffer[n];
framecnt_t const curve_offset = fade_interval_start - (_length - _fade_out->back()->when);
- 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 out */
- for (framecnt_t n = 0, m = fade_out_offset; n < fade_out_limit; ++n, ++m) {
- buf[m] *= gain_buffer[n];
+ 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 out */
+ 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 */
+
+ _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];
+ }
}
-
- /* 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 THE REGION BODY FROM mixdown_buffer INTO buf */
+ /* MIX OR COPY 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);
+ framecnt_t const N = to_read - fade_in_limit - fade_out_limit;
+ if (N > 0) {
+ if (opaque ()) {
+ 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;
}
child->add_child_nocopy (_fade_in->get_state ());
}
+ if (_inverse_fade_in) {
+ child = node.add_child (X_("InvFadeIn"));
+ child->add_child_nocopy (_inverse_fade_in->get_state ());
+ }
+
child = node.add_child (X_("FadeOut"));
if (_default_fade_out) {
child->add_child_nocopy (_fade_out->get_state ());
}
+ if (_inverse_fade_out) {
+ child = node.add_child (X_("InvFadeOut"));
+ child->add_child_nocopy (_inverse_fade_out->get_state ());
+ }
+
return node;
}
_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");
}
}
+ /* legacy a3 */
+
+ if ((prop = child->property ("is-xfade")) != 0) {
+ _fade_in_is_xfade = string_is_affirmative (prop->value());
+ }
+
} else if (child->name() == "FadeOut") {
_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");
_fade_out->set_state (*grandchild, version);
}
}
-
+
if ((prop = child->property ("active")) != 0) {
if (string_is_affirmative (prop->value())) {
set_fade_out_active (true);
}
}
+ /* legacy a3 */
+
+ if ((prop = child->property ("is-xfade")) != 0) {
+ _fade_out_is_xfade = string_is_affirmative (prop->value());
+ }
+
+ } else if (child->name() == "InvFadeIn") {
+ XMLNode* grandchild = child->child ("AutomationList");
+ if (grandchild) {
+ _inverse_fade_in->set_state (*grandchild, version);
+ }
+ } else if (child->name() == "InvFadeOut") {
+ XMLNode* grandchild = child->child ("AutomationList");
+ if (grandchild) {
+ _inverse_fade_out->set_state (*grandchild, version);
+ }
}
}
_fade_in->freeze ();
*_fade_in = *f;
_fade_in->thaw ();
+ _default_fade_in = false;
send_change (PropertyChange (Properties::fade_in));
}
void
AudioRegion::set_fade_in (FadeShape shape, framecnt_t len)
{
+ boost::shared_ptr<Evoral::ControlList> c1 (new Evoral::ControlList (FadeInAutomation));
+ boost::shared_ptr<Evoral::ControlList> c2 (new Evoral::ControlList (FadeInAutomation));
+ boost::shared_ptr<Evoral::ControlList> 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, _fade_in);
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, len, 10, -60);
+ reverse_curve (c1, _fade_in);
+ _fade_in->copy_events (*c1);
+ generate_inverse_power_curve (_inverse_fade_in, _fade_in);
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 ();
+ 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, c1, c2);
+ reverse_curve (c3, _fade_in);
+ _fade_in->copy_events (*c3);
+ generate_inverse_power_curve (_inverse_fade_in, _fade_in);
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 ();
- 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, _fade_in);
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);
+ _fade_in->copy_events (*c3);
+ reverse_curve (_inverse_fade_in, _fade_in );
break;
}
+ _default_fade_in = false;
_fade_in->thaw ();
send_change (PropertyChange (Properties::fade_in));
}
_fade_out->freeze ();
*_fade_out = *f;
_fade_out->thaw ();
+ _default_fade_out = false;
send_change (PropertyChange (Properties::fade_in));
}
void
AudioRegion::set_fade_out (FadeShape shape, framecnt_t len)
{
+ boost::shared_ptr<Evoral::ControlList> c1 (new Evoral::ControlList (FadeOutAutomation));
+ boost::shared_ptr<Evoral::ControlList> 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, _fade_out);
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, len, 10, -60);
+ generate_inverse_power_curve (_inverse_fade_out, _fade_out);
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, c1, c2);
+ generate_inverse_power_curve (_inverse_fade_out, _fade_out);
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 (FadeInAutomation)));
+ 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.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, _fade_out);
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 (FadeInAutomation)));
+
+ 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, _fade_out);
break;
}
+ _default_fade_out = false;
_fade_out->thaw ();
- send_change (PropertyChange (Properties::fade_in));
+ send_change (PropertyChange (Properties::fade_out));
}
void
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);
+ }
+
+ if (_session.config.get_xfade_model() == FullCrossfade &&
+ _session.config.get_auto_xfade() &&
+ _fade_in_is_xfade && !_fade_in_is_short) {
+
+ /* trim a single other region below us to the new start
+ of the fade.
+ */
+
+ boost::shared_ptr<Region> other = get_single_other_xfade_region (true);
+ if (other) {
+ other->trim_end (position() + len);
+ }
+ }
+
_default_fade_in = false;
send_change (PropertyChange (Properties::fade_in));
}
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;
+
+ if (_session.config.get_xfade_model() == FullCrossfade &&
+ _session.config.get_auto_xfade() &&
+ _fade_out_is_xfade && !_fade_out_is_short) {
+
+ /* trim a single other region below us to the new start
+ of the fade.
+ */
+
+ boost::shared_ptr<Region> other = get_single_other_xfade_region (false);
+ if (other) {
+ other->trim_front (last_frame() - len);
+ }
+ }
+
send_change (PropertyChange (Properties::fade_out));
}
}
{
_fade_in_suspended = 0;
_fade_in_is_xfade = false;
+ _fade_in_is_short = true;
set_fade_in (FadeLinear, 64);
}
{
_fade_out_suspended = 0;
_fade_out_is_xfade = false;
+ _fade_out_is_short = true;
set_fade_out (FadeLinear, 64);
}
void
AudioRegion::set_fade_in_is_xfade (bool yn)
{
+ if (yn == _fade_in_is_xfade) {
+ return;
+ }
+
_fade_in_is_xfade = yn;
+ send_change (PropertyChange (Properties::fade_in_is_xfade));
}
void
AudioRegion::set_fade_out_is_xfade (bool yn)
{
+ if (yn == _fade_out_is_xfade) {
+ return;
+ }
+
_fade_out_is_xfade = yn;
+ send_change (PropertyChange (Properties::fade_out_is_xfade));
+}
+
+void
+AudioRegion::set_fade_in_is_short (bool yn)
+{
+ if (yn == _fade_in_is_short) {
+ return;
+ }
+
+ _fade_in_is_short = yn;
+ send_change (PropertyChange (Properties::fade_in_is_short));
+
+}
+
+void
+AudioRegion::set_fade_out_is_short (bool yn)
+{
+ if (yn == _fade_out_is_short) {
+ return;
+ }
+
+ _fade_out_is_short = yn;
+ send_change (PropertyChange (Properties::fade_out_is_short));
+}
+
+boost::shared_ptr<Region>
+AudioRegion::get_single_other_xfade_region (bool start) const
+{
+ boost::shared_ptr<Playlist> pl (playlist());
+
+ if (!pl) {
+ /* not currently in a playlist - xfade length is unbounded
+ (and irrelevant)
+ */
+ return boost::shared_ptr<AudioRegion> ();
+ }
+
+ boost::shared_ptr<RegionList> rl;
+
+ if (start) {
+ rl = pl->regions_at (position());
+ } else {
+ rl = pl->regions_at (last_frame());
+ }
+
+ RegionList::iterator i;
+ boost::shared_ptr<Region> 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<AudioRegion> ();
+ }
+
+ return other;
+}
+
+framecnt_t
+AudioRegion::verify_xfade_bounds (framecnt_t len, bool start)
+{
+ /* 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<Region> 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" {
projects / ardour.git / blobdiff