#include <boost/scoped_array.hpp>
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
#include "pbd/basename.h"
#include "pbd/xml++.h"
#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"
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;
+ PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > fade_in;
+ PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > inverse_fade_in;
+ PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > fade_out;
+ PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > inverse_fade_out;
+ PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > envelope;
}
}
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);
+ for (Evoral::ControlList::const_reverse_iterator it = src->rbegin(); it!=src->rend(); it++) {
+ dst->fast_simple_add (len - (*it)->when, (*it)->value);
}
}
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++;
}
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
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 \
, _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<AutomationList> (new AutomationList (Evoral::Parameter (FadeInAutomation)))) \
+ , _inverse_fade_in (Properties::inverse_fade_in, boost::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter (FadeInAutomation)))) \
+ , _fade_out (Properties::fade_out, boost::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter (FadeOutAutomation)))) \
+ , _inverse_fade_out (Properties::inverse_fade_out, boost::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter (FadeOutAutomation))))
#define AUDIOREGION_COPY_STATE(other) \
_envelope_active (Properties::envelope_active, other->_envelope_active) \
, _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<AutomationList> (new AutomationList (*other->_fade_in.val()))) \
+ , _inverse_fade_in (Properties::fade_in, boost::shared_ptr<AutomationList> (new AutomationList (*other->_inverse_fade_in.val()))) \
+ , _fade_out (Properties::fade_in, boost::shared_ptr<AutomationList> (new AutomationList (*other->_fade_out.val()))) \
+ , _inverse_fade_out (Properties::fade_in, boost::shared_ptr<AutomationList> (new AutomationList (*other->_inverse_fade_out.val())))
/* a Session will reset these to its chosen defaults by calling AudioRegion::set_default_fade() */
void
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<AutomationList> (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)
{
AudioRegion::AudioRegion (const SourceList& srcs)
: Region (srcs)
, AUDIOREGION_STATE_DEFAULT
+ , _envelope (Properties::envelope, boost::shared_ptr<AutomationList> (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)
{
AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> 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<AutomationList> (new AutomationList (*other->_envelope.val(), 0, other->_length)))
+ , _automatable (other->session())
, _fade_in_suspended (0)
, _fade_out_suspended (0)
{
AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> 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<AutomationList> (new AutomationList (*other->_envelope.val(), offset, other->_length)))
+ , _automatable (other->session())
, _fade_in_suspended (0)
, _fade_out_suspended (0)
{
AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other, const SourceList& srcs)
: Region (boost::static_pointer_cast<const Region>(other), srcs)
, AUDIOREGION_COPY_STATE (other)
+ , _envelope (Properties::envelope, boost::shared_ptr<AutomationList> (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)
{
AudioRegion::AudioRegion (SourceList& srcs)
: Region (srcs)
, AUDIOREGION_STATE_DEFAULT
+ , _envelope (Properties::envelope, boost::shared_ptr<AutomationList> (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)
{
return 0;
}
- if (muted()) {
- return 0; /* read nothing */
- }
-
-
/* WORK OUT WHERE TO GET DATA FROM */
framecnt_t to_read;
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);
*/
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<AudioSource> src = boost::dynamic_pointer_cast<AudioSource> (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);
}
}
}
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");
}
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 ());
}
}
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 ());
}
}
}
- /* 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 ();
set_fade_out_active (false);
}
}
-
- /* legacy a3 */
-
- if ((prop = child->property ("is-xfade")) != 0) {
- _fade_out_is_xfade = string_is_affirmative (prop->value());
- }
-
- } 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);
AudioRegion::set_fade_in (boost::shared_ptr<AutomationList> f)
{
_fade_in->freeze ();
- *_fade_in = *f;
+ *(_fade_in.val()) = *f;
_fade_in->thaw ();
_default_fade_in = false;
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, 10, -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);
+ 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:
_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:
_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;
}
AudioRegion::set_fade_out (boost::shared_ptr<AutomationList> f)
{
_fade_out->freeze ();
- *_fade_out = *f;
+ *(_fade_out.val()) = *f;
_fade_out->thaw ();
_default_fade_out = false;
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:
_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:
_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;
}
_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));
}
_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));
}
AudioRegion::set_default_fade_in ()
{
_fade_in_suspended = 0;
- _fade_in_is_xfade = false;
- _fade_in_is_short = true;
set_fade_in (FadeLinear, 64);
}
AudioRegion::set_default_fade_out ()
{
_fade_out_suspended = 0;
- _fade_out_is_xfade = false;
- _fade_out_is_short = true;
set_fade_out (FadeLinear, 64);
}
return Evoral::Range<framepos_t> (first_frame() + _fade_in->back()->when + 1, 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));
-}
-
boost::shared_ptr<Region>
AudioRegion::get_single_other_xfade_region (bool start) const
{
projects / ardour.git / blobdiff