#include "pbd/stacktrace.h"
+#include "ardour/debug.h"
#include "ardour/types.h"
#include "ardour/crossfade.h"
#include "ardour/crossfade_compare.h"
#include "ardour/utils.h"
#include "ardour/session.h"
#include "ardour/source.h"
+#include "ardour/region_factory.h"
#include "i18n.h"
#include <locale.h>
using namespace PBD;
framecnt_t Crossfade::_short_xfade_length = 0;
-PropertyChange Crossfade::ActiveChanged = new_change();
-PropertyChange Crossfade::FollowOverlapChanged = new_change();
/* XXX if and when we ever implement parallel processing of the process()
callback, these will need to be handled on a per-thread basis.
Sample* Crossfade::crossfade_buffer_out = 0;
Sample* Crossfade::crossfade_buffer_in = 0;
+
+#define CROSSFADE_DEFAULT_PROPERTIES \
+ _active (Properties::active, _session.config.get_xfades_active ()) \
+ , _follow_overlap (Properties::follow_overlap, false)
+
+
+namespace ARDOUR {
+ namespace Properties {
+ PropertyDescriptor<bool> follow_overlap;
+ }
+}
+
+void
+Crossfade::make_property_quarks ()
+{
+ Properties::follow_overlap.property_id = g_quark_from_static_string (X_("follow-overlap"));
+ DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for follow-overlap = %1\n", Properties::follow_overlap.property_id));
+}
+
void
Crossfade::set_buffer_size (framecnt_t sz)
{
framecnt_t length,
framepos_t position,
AnchorPoint ap)
- : AudioRegion (in->session(), position, length, in->name() + string ("<>") + out->name()),
- _fade_in (Evoral::Parameter(FadeInAutomation)), // linear (gain coefficient) => -inf..+6dB
- _fade_out (Evoral::Parameter(FadeOutAutomation)) // linear (gain coefficient) => -inf..+6dB
+ : AudioRegion (in->session(), position, length, in->name() + string ("<>") + out->name())
+ , CROSSFADE_DEFAULT_PROPERTIES
+ , _fade_in (Evoral::Parameter(FadeInAutomation)) // linear (gain coefficient) => -inf..+6dB
+ , _fade_out (Evoral::Parameter(FadeOutAutomation)) // linear (gain coefficient) => -inf..+6dB
{
_in = in;
_out = out;
_anchor_point = ap;
- _follow_overlap = false;
-
- _active = _session.config.get_xfades_active ();
_fixed = true;
+ _follow_overlap = false;
initialize ();
}
Crossfade::Crossfade (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioRegion> b, CrossfadeModel model, bool act)
- : AudioRegion (a->session(), 0, 0, a->name() + string ("<>") + b->name()),
- _fade_in (Evoral::Parameter(FadeInAutomation)), // linear (gain coefficient) => -inf..+6dB
- _fade_out (Evoral::Parameter(FadeOutAutomation)) // linear (gain coefficient) => -inf..+6dB
+ : AudioRegion (a->session(), 0, 0, a->name() + string ("<>") + b->name())
+ , CROSSFADE_DEFAULT_PROPERTIES
+ , _fade_in (Evoral::Parameter(FadeInAutomation)) // linear (gain coefficient) => -inf..+6dB
+ , _fade_out (Evoral::Parameter(FadeOutAutomation)) // linear (gain coefficient) => -inf..+6dB
{
_in_update = false;
_fixed = false;
initialize ();
}
-Crossfade::Crossfade (const Playlist& playlist, XMLNode& node)
- : AudioRegion (playlist.session(), 0, 0, "unnamed crossfade"),
- _fade_in (Evoral::Parameter(FadeInAutomation)), // linear (gain coefficient) => -inf..+6dB
- _fade_out (Evoral::Parameter(FadeOutAutomation)) // linear (gain coefficient) => -inf..+6dB
+Crossfade::Crossfade (const Playlist& playlist, XMLNode const & node)
+ : AudioRegion (playlist.session(), 0, 0, "unnamed crossfade")
+ , CROSSFADE_DEFAULT_PROPERTIES
+ , _fade_in (Evoral::Parameter(FadeInAutomation)) // linear (gain coefficient) => -inf..+6dB
+ , _fade_out (Evoral::Parameter(FadeOutAutomation)) // linear (gain coefficient) => -inf..+6dB
{
boost::shared_ptr<Region> r;
- XMLProperty* prop;
+ XMLProperty const * prop;
LocaleGuard lg (X_("POSIX"));
/* we have to find the in/out regions before we can do anything else */
PBD::ID id (prop->value());
- if ((r = playlist.find_region (id)) == 0) {
- error << string_compose (_("Crossfade: no \"in\" region %1 found in playlist %2"), id, playlist.name())
+ r = playlist.find_region (id);
+
+ if (!r) {
+ /* the `in' region is not in a playlist, which probably means that this crossfade
+ is in the undo record, so we have to find the region in the global region map.
+ */
+ r = RegionFactory::region_by_id (id);
+ }
+
+ if (!r) {
+ error << string_compose (_("Crossfade: no \"in\" region %1 found in playlist %2 nor in region map"), id, playlist.name())
<< endmsg;
throw failed_constructor();
}
PBD::ID id2 (prop->value());
- if ((r = playlist.find_region (id2)) == 0) {
- error << string_compose (_("Crossfade: no \"out\" region %1 found in playlist %2"), id2, playlist.name())
+ r = playlist.find_region (id2);
+
+ if (!r) {
+ r = RegionFactory::region_by_id (id2);
+ }
+
+ if (!r) {
+ error << string_compose (_("Crossfade: no \"out\" region %1 found in playlist %2 nor in region map"), id2, playlist.name())
<< endmsg;
throw failed_constructor();
}
Crossfade::Crossfade (boost::shared_ptr<Crossfade> orig, boost::shared_ptr<AudioRegion> newin, boost::shared_ptr<AudioRegion> newout)
: AudioRegion (boost::dynamic_pointer_cast<const AudioRegion> (orig), 0, true)
+ , CROSSFADE_DEFAULT_PROPERTIES
, _fade_in (orig->_fade_in)
, _fade_out (orig->_fade_out)
{
_sources = _in->sources();
_sources.insert (_sources.end(), _out->sources().begin(), _out->sources().end());
+
+ for (SourceList::iterator i = _sources.begin(); i != _sources.end(); ++i) {
+ (*i)->inc_use_count ();
+ }
+
_master_sources = _in->master_sources();
_master_sources.insert(_master_sources.end(), _out->master_sources().begin(), _out->master_sources().end());
+ for (SourceList::iterator i = _master_sources.begin(); i != _master_sources.end(); ++i) {
+ (*i)->inc_use_count ();
+ }
+
_in_update = false;
_out->suspend_fade_out ();
{
if (_active != yn) {
_active = yn;
- StateChanged (ActiveChanged);
+ PropertyChanged (PropertyChange (Properties::active));
}
}
}
if (send_signal) {
- StateChanged (BoundsChanged); /* EMIT SIGNAL */
+ PropertyChange bounds;
+ bounds.add (Properties::start);
+ bounds.add (Properties::position);
+ bounds.add (Properties::length);
+ PropertyChanged (bounds); /* EMIT SIGNAL */
}
_in_update = false;
XMLNode* fo;
const XMLProperty* prop;
LocaleGuard lg (X_("POSIX"));
- PropertyChange what_changed = PropertyChange (0);
+ PropertyChange what_changed;
framepos_t val;
if ((prop = node.property ("position")) != 0) {
sscanf (prop->value().c_str(), "%" PRId64, &val);
if (val != _position) {
_position = val;
- what_changed = PropertyChange (what_changed | PositionChanged);
+ what_changed.add (Properties::position);
}
} else {
warning << _("old-style crossfade information - no position information") << endmsg;
bool x = string_is_affirmative (prop->value());
if (x != _active) {
_active = x;
- what_changed = PropertyChange (what_changed | ActiveChanged);
+ what_changed.add (Properties::active);
}
} else {
_active = true;
sscanf (prop->value().c_str(), "%" PRId64, &val);
if (val != _length) {
_length = val;
- what_changed = PropertyChange (what_changed | LengthChanged);
+ what_changed.add (Properties::length);
}
} else {
}
}
+ _fade_in.front()->value = 0.0;
+ _fade_in.back()->value = 1.0;
+
_fade_in.thaw ();
/* fade out */
}
}
+ _fade_out.front()->value = 1.0;
+ _fade_out.back()->value = 0.0;
+
_fade_out.thaw ();
- StateChanged (what_changed); /* EMIT SIGNAL */
+ PropertyChanged (what_changed); /* EMIT SIGNAL */
+ FadesChanged (); /* EMIT SIGNAL */
return 0;
}
set_xfade_length (_out->first_frame() + _out->length() - _in->first_frame());
}
- StateChanged (FollowOverlapChanged);
+ PropertyChanged (PropertyChange (Properties::follow_overlap));
}
framecnt_t
_length = len;
- StateChanged (LengthChanged);
-
+ PropertyChanged (PropertyChange (Properties::length));
+
return len;
}