X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudioregion.cc;h=63530e2f01774b48835ff02d26e84652df270e4f;hb=17702278345e6ab728623038fa6c0b6811cdbc78;hp=66b978131dab0ec908ed09127fe2888dbdcfbac6;hpb=e3f73f265511cb6890e646094956da8c438e3505;p=ardour.git diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 66b978131d..63530e2f01 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" @@ -39,6 +39,7 @@ #include "ardour/audioregion.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" @@ -61,10 +62,11 @@ namespace ARDOUR { PBD::PropertyDescriptor fade_in_active; PBD::PropertyDescriptor fade_out_active; PBD::PropertyDescriptor scale_amplitude; - PBD::PropertyDescriptor fade_out_is_xfade; - PBD::PropertyDescriptor fade_out_is_short; - PBD::PropertyDescriptor fade_in_is_xfade; - PBD::PropertyDescriptor fade_in_is_short; + PBD::PropertyDescriptor > fade_in; + PBD::PropertyDescriptor > inverse_fade_in; + PBD::PropertyDescriptor > fade_out; + PBD::PropertyDescriptor > inverse_fade_out; + PBD::PropertyDescriptor > envelope; } } @@ -76,16 +78,15 @@ static void reverse_curve (boost::shared_ptr dst, boost::shared_ptr 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 ); + 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 + // 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); @@ -94,18 +95,6 @@ generate_inverse_power_curve (boost::shared_ptr dst, boost: } } -/* -static void -generate_inverse_coefficient_curve (boost::shared_ptr dst, boost::shared_ptr 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 dst, double len, int num_steps, float dB_drop) { @@ -147,7 +136,7 @@ merge_curves (boost::shared_ptr dst, interp += v2 * ( (double)count / (double)size ); interp = dB_to_coefficient(interp); - dst->add ( (*c1)->when, interp ); + dst->fast_simple_add ( (*c1)->when, interp ); c1++; count++; } @@ -168,14 +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_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)); + 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 @@ -189,10 +180,11 @@ AudioRegion::register_properties () 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); + 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 \ @@ -202,10 +194,10 @@ AudioRegion::register_properties () , _fade_in_active (Properties::fade_in_active, true) \ , _fade_out_active (Properties::fade_out_active, true) \ , _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) + , _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) \ @@ -214,10 +206,10 @@ AudioRegion::register_properties () , _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) \ - , _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) + , _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 @@ -239,12 +231,8 @@ 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))) - , _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) { @@ -256,12 +244,8 @@ 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))) - , _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) { @@ -272,15 +256,11 @@ 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)) - , _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)) + , _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) { @@ -298,15 +278,11 @@ 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)) - , _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)) + , _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) { @@ -324,12 +300,8 @@ 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)) - , _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) { @@ -347,12 +319,8 @@ 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))) - , _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) { @@ -441,14 +409,22 @@ AudioRegion::set_envelope_active (bool yn) } } +/** @param buf Buffer to put peak data in. + * @param npeaks Number of peaks to read (ie the number of PeakDatas in buf) + * @param offset Start position, as an offset from the start of this region's source. + * @param cnt Number of samples to read. + * @param chan_n Channel. + * @param frames_per_pixel Number of samples to use to generate one peak value. + */ + ARDOUR::framecnt_t -AudioRegion::read_peaks (PeakData *buf, framecnt_t npeaks, framecnt_t offset, framecnt_t cnt, uint32_t chan_n, double samples_per_unit) const +AudioRegion::read_peaks (PeakData *buf, framecnt_t npeaks, framecnt_t offset, framecnt_t cnt, uint32_t chan_n, double frames_per_pixel) const { if (chan_n >= _sources.size()) { return 0; } - if (audio_source(chan_n)->read_peaks (buf, npeaks, offset, cnt, samples_per_unit)) { + if (audio_source(chan_n)->read_peaks (buf, npeaks, offset, cnt, frames_per_pixel)) { return 0; } else { if (_scale_amplitude != 1.0f) { @@ -513,11 +489,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; @@ -536,7 +507,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 @@ -544,7 +515,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; @@ -554,7 +525,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) { @@ -623,7 +594,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) @@ -635,7 +605,7 @@ AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, if (opaque()) { if (_inverse_fade_in) { - + /* explicit inverse fade in curve (e.g. for constant * power), so we have to fetch it. */ @@ -667,7 +637,6 @@ AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, _fade_in->curve().get_vector (internal_offset, internal_offset + fade_in_limit, gain_buffer, fade_in_limit); } - /* 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]; @@ -683,18 +652,19 @@ AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, _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 */ + /* 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, so just use (1 - fade + + /* no explicit inverse fade out (which is + * actually a fade in), so just use (1 - fade * out) for the fade in of lower layers */ @@ -708,18 +678,21 @@ AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, _fade_out->curve().get_vector (curve_offset, curve_offset + fade_out_limit, gain_buffer, fade_out_limit); } - /* 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 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); @@ -768,15 +741,20 @@ 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 - */ - uint32_t channel = n_channels() % chan_n; + /* copy an existing channel's data in for this non-existant one */ + + uint32_t channel = chan_n % n_channels(); boost::shared_ptr src = boost::dynamic_pointer_cast (srcs[channel]); 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); } } @@ -784,17 +762,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"); @@ -826,7 +811,7 @@ AudioRegion::state () } if (_inverse_fade_in) { - child = node.add_child (X_("InvFadeIn")); + child = node.add_child (X_("InverseFadeIn")); child->add_child_nocopy (_inverse_fade_in->get_state ()); } @@ -839,7 +824,7 @@ AudioRegion::state () } if (_inverse_fade_out) { - child = node.add_child (X_("InvFadeOut")); + child = node.add_child (X_("InverseFadeOut")); child->add_child_nocopy (_inverse_fade_out->get_state ()); } @@ -917,14 +902,6 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_ } } - /* legacy a3 */ - - if ((prop = child->property ("is-xfade")) != 0) { - _fade_in_is_xfade = string_is_affirmative (prop->value()); - } else { - _fade_in_is_xfade = false; - } - } else if (child->name() == "FadeOut") { _fade_out->clear (); @@ -945,21 +922,13 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_ set_fade_out_active (false); } } - - /* legacy a3 */ - - if ((prop = child->property ("is-xfade")) != 0) { - _fade_out_is_xfade = string_is_affirmative (prop->value()); - } else { - _fade_out_is_xfade = false; - } - - } else if (child->name() == "InvFadeIn") { + + } else if (child->name() == "InverseFadeIn") { XMLNode* grandchild = child->child ("AutomationList"); if (grandchild) { _inverse_fade_in->set_state (*grandchild, version); } - } else if (child->name() == "InvFadeOut") { + } else if (child->name() == "InverseFadeOut") { XMLNode* grandchild = child->child ("AutomationList"); if (grandchild) { _inverse_fade_out->set_state (*grandchild, version); @@ -1004,7 +973,7 @@ 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; @@ -1018,6 +987,8 @@ AudioRegion::set_fade_in (FadeShape shape, framecnt_t len) boost::shared_ptr c2 (new Evoral::ControlList (FadeInAutomation)); boost::shared_ptr c3 (new Evoral::ControlList (FadeInAutomation)); + const int num_steps = min ((framecnt_t) 16, len); + _fade_in->freeze (); _fade_in->clear (); _inverse_fade_in->clear (); @@ -1026,32 +997,32 @@ AudioRegion::set_fade_in (FadeShape shape, framecnt_t len) case FadeLinear: _fade_in->fast_simple_add (0.0, 0.0); _fade_in->fast_simple_add (len, 1.0); - reverse_curve (_inverse_fade_in, _fade_in); + reverse_curve (_inverse_fade_in.val(), _fade_in.val()); break; case FadeFast: - generate_db_fade (_fade_in, len, 10, -60); - reverse_curve (c1, _fade_in); + generate_db_fade (_fade_in.val(), len, num_steps, -60); + reverse_curve (c1, _fade_in.val()); _fade_in->copy_events (*c1); - generate_inverse_power_curve (_inverse_fade_in, _fade_in); + generate_inverse_power_curve (_inverse_fade_in.val(), _fade_in.val()); 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 - merge_curves (_fade_in, c1, c2); - reverse_curve (c3, _fade_in); + generate_db_fade (c1, len, num_steps/2, -1); // start off with a slow fade + generate_db_fade (c2, len, num_steps/2, -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, _fade_in); + generate_inverse_power_curve (_inverse_fade_in.val(), _fade_in.val()); break; case FadeConstantPower: - for (int i = 0; i < 9; ++i) { - float dist = (float) i / 10.0f; + for (int i = 0; i < num_steps; ++i) { + float dist = (float) i / (num_steps+1.0); _fade_in->fast_simple_add (len*dist, sin (dist*M_PI/2)); } _fade_in->fast_simple_add (len, 1.0); - reverse_curve (_inverse_fade_in, _fade_in); + reverse_curve (_inverse_fade_in.val(), _fade_in.val()); break; case FadeSymmetric: @@ -1060,7 +1031,6 @@ AudioRegion::set_fade_in (FadeShape shape, framecnt_t len) _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++) { @@ -1069,9 +1039,9 @@ AudioRegion::set_fade_in (FadeShape shape, framecnt_t len) _fade_in->fast_simple_add (len* (breakpoint+((1.0-breakpoint)*(double)i/(double)num_steps)), coeff); } _fade_in->fast_simple_add (len, VERY_SMALL_SIGNAL); - reverse_curve (c3, _fade_in); + reverse_curve (c3, _fade_in.val()); _fade_in->copy_events (*c3); - reverse_curve (_inverse_fade_in, _fade_in ); + reverse_curve (_inverse_fade_in.val(), _fade_in.val()); break; } @@ -1084,7 +1054,7 @@ 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; @@ -1105,19 +1075,19 @@ AudioRegion::set_fade_out (FadeShape shape, framecnt_t len) case FadeLinear: _fade_out->fast_simple_add (0.0, 1.0); _fade_out->fast_simple_add (len, VERY_SMALL_SIGNAL); - reverse_curve (_inverse_fade_out, _fade_out); + reverse_curve (_inverse_fade_out.val(), _fade_out.val()); break; case FadeFast: - generate_db_fade (_fade_out, len, 10, -60); - generate_inverse_power_curve (_inverse_fade_out, _fade_out); + generate_db_fade (_fade_out.val(), len, 10, -60); + generate_inverse_power_curve (_inverse_fade_out.val(), _fade_out.val()); 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 - merge_curves (_fade_out, c1, c2); - generate_inverse_power_curve (_inverse_fade_out, _fade_out); + merge_curves (_fade_out.val(), c1, c2); + generate_inverse_power_curve (_inverse_fade_out.val(), _fade_out.val()); break; case FadeConstantPower: @@ -1129,7 +1099,7 @@ AudioRegion::set_fade_out (FadeShape shape, framecnt_t len) _fade_out->fast_simple_add ((len * dist), cos(dist*M_PI/2)); } _fade_out->fast_simple_add (len, VERY_SMALL_SIGNAL); - reverse_curve (_inverse_fade_out, _fade_out); + reverse_curve (_inverse_fade_out.val(), _fade_out.val()); break; case FadeSymmetric: @@ -1148,7 +1118,7 @@ AudioRegion::set_fade_out (FadeShape shape, framecnt_t len) _fade_out->fast_simple_add (len* (breakpoint+((1.0-breakpoint)*(double)i/(double)num_steps)), coeff); } _fade_out->fast_simple_add (len, VERY_SMALL_SIGNAL); - reverse_curve (_inverse_fade_out, _fade_out); + reverse_curve (_inverse_fade_out.val(), _fade_out.val()); break; } @@ -1175,20 +1145,6 @@ AudioRegion::set_fade_in_length (framecnt_t len) _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 other = get_single_other_xfade_region (true); - if (other) { - other->trim_end (position() + len); - } - } - _default_fade_in = false; send_change (PropertyChange (Properties::fade_in)); } @@ -1213,20 +1169,6 @@ AudioRegion::set_fade_out_length (framecnt_t len) _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 other = get_single_other_xfade_region (false); - if (other) { - other->trim_front (last_frame() - len); - } - } send_change (PropertyChange (Properties::fade_out)); } @@ -1269,18 +1211,14 @@ void AudioRegion::set_default_fade_in () { _fade_in_suspended = 0; - _fade_in_is_xfade = false; - _fade_in_is_short = true; - set_fade_in (FadeLinear, 64); + set_fade_in (Config->get_default_fade_shape(), 64); } void AudioRegion::set_default_fade_out () { _fade_out_suspended = 0; - _fade_out_is_xfade = false; - _fade_out_is_short = true; - set_fade_out (FadeLinear, 64); + set_fade_out (Config->get_default_fade_shape(), 64); } void @@ -1845,52 +1783,7 @@ 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); -} - -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)); + return Evoral::Range (first_frame() + _fade_in->back()->when + 1, last_frame() - _fade_out->back()->when); } boost::shared_ptr @@ -1968,22 +1861,3 @@ AudioRegion::verify_xfade_bounds (framecnt_t len, bool start) } -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) -{ - return ((AudioRegion *) arg)->read_peaks ((PeakData *) data, (framecnt_t) npeaks, (framepos_t) start, (framecnt_t) cnt, n_chan,samples_per_unit); -} - -uint32_t region_length_from_c (void *arg) -{ - - return ((AudioRegion *) arg)->length(); -} - -uint32_t sourcefile_length_from_c (void *arg, double zoom_factor) -{ - return ( (AudioRegion *) arg)->audio_source()->available_peaks (zoom_factor) ; -} - -} /* extern "C" */