#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;
}
}
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 );
+ 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
+ // 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);
}
}
-/*
-static void
-generate_inverse_coefficient_curve (boost::shared_ptr<Evoral::ControlList> dst, boost::shared_ptr<const Evoral::ControlList> src)
-{
- //calc inverse gain coefficient curve
- for (Evoral::ControlList::const_iterator it = src->begin(); it!=src->end(); ++it ) {
- float value = 1.0 - (*it)->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
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
, _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());
, _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());
, _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
*/
, _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
*/
, _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) */
, _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 ();
/* 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
*/
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;
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) {
/* 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) {
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)
*/
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 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 */
+
+ _fade_out->curve().get_vector (curve_offset, curve_offset + fade_out_limit, gain_buffer, fade_out_limit);
+
+ } else {
+
+ /* 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 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 = node.add_child (X_("FadeIn"));
- child->add_property ("is-xfade", (_fade_in_is_xfade ? "yes" : "no"));
if (_default_fade_in) {
child->add_property ("default", "yes");
}
child = node.add_child (X_("FadeOut"));
- child->add_property ("is-xfade", (_fade_out_is_xfade ? "yes" : "no"));
if (_default_fade_out) {
child->add_property ("default", "yes");
}
}
- if ((prop = child->property ("is-xfade")) != 0) {
- _fade_in_is_xfade = string_is_affirmative (prop->value());
- } else {
- _fade_in_is_xfade = false;
- }
-
if ((prop = child->property ("active")) != 0) {
if (string_is_affirmative (prop->value())) {
set_fade_in_active (true);
}
}
+ /* 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 ();
_fade_out->set_state (*grandchild, version);
}
}
-
- if ((prop = child->property ("is-xfade")) != 0) {
- _fade_out_is_xfade = string_is_affirmative (prop->value());
- } else {
- _fade_out_is_xfade = false;
- }
-
- if ((prop = child->property ("active")) != 0) {
+
+ if ((prop = child->property ("active")) != 0) {
if (string_is_affirmative (prop->value())) {
set_fade_out_active (true);
} else {
}
}
+ /* 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) {
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;
_fade_in->fast_simple_add (len*dist, sin (dist*M_PI/2));
}
_fade_in->fast_simple_add (len, 1.0);
- generate_inverse_power_curve (_inverse_fade_in, _fade_in);
+ reverse_curve (_inverse_fade_in, _fade_in);
break;
case FadeSymmetric:
- // starts kind of like a constant power but has a slower fadeout
- // however it is NOT constant power and there will be a level drop in the middle of the crossfade
- c1->fast_simple_add (0.0, 1.0);
- for ( int i = 1; i < 9; i++ ) {
- float dist = (float)i/10.0;
- c1->fast_simple_add ((len * dist), cos(dist*M_PI/10.0));
+ //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);
}
- c1->fast_simple_add (len, VERY_SMALL_SIGNAL);
-
- //curve 2 is a slow fade at end
- generate_db_fade (c2, len, 10, -30 );
-
- merge_curves (c3, c1, c2);
- reverse_curve (_fade_in, c3);
+ _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;
}
break;
case FadeFast:
- generate_db_fade (_fade_out, len, 10, -60 );
+ generate_db_fade (_fade_out, len, 10, -60);
generate_inverse_power_curve (_inverse_fade_out, _fade_out);
break;
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
+ 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;
_fade_out->fast_simple_add ((len * dist), cos(dist*M_PI/2));
}
_fade_out->fast_simple_add (len, VERY_SMALL_SIGNAL);
- generate_inverse_power_curve (_inverse_fade_out, _fade_out);
+ reverse_curve (_inverse_fade_out, _fade_out);
break;
case FadeSymmetric:
- //starts kind of like a constant power but has a slower fadeout
- //however it is NOT constant power and there will be a level drop in the middle of the crossfade
- c1->fast_simple_add (0.0, 1.0);
- for ( int i = 1; i < 9; i++ ) {
- float dist = (float)i/10.0;
- c1->fast_simple_add ((len * dist), cos(dist*M_PI/10.0)); //cheesy way of making a flat line
+ //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);
}
- c1->fast_simple_add (len, VERY_SMALL_SIGNAL);
-
- //curve 2 is a slow fade at end
- generate_db_fade (c2, len, 10, -30);
-
- merge_curves (_fade_out, c1, c2);
+ _fade_out->fast_simple_add (len, VERY_SMALL_SIGNAL);
reverse_curve (_inverse_fade_out, _fade_out);
break;
}
if (_session.config.get_xfade_model() == FullCrossfade &&
_session.config.get_auto_xfade() &&
- _fade_in_is_xfade) {
+ _fade_in_is_xfade && !_fade_in_is_short) {
/* trim a single other region below us to the new start
of the fade.
if (_session.config.get_xfade_model() == FullCrossfade &&
_session.config.get_auto_xfade() &&
- _fade_out_is_xfade) {
+ _fade_out_is_xfade && !_fade_out_is_short) {
/* trim a single other region below us to the new start
of the fade.
{
_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>
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 */
- return len;
+ /* 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
maxlen = last_frame() - other->earliest_possible_position();
}
- return min (maxlen, len);
+ return min (length(), min (maxlen, len));
}
projects / ardour.git / blobdiff