X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fcrossfade.cc;h=69f3cb32c1d577954b1c87a3a02a75c97eb55660;hb=bb02870c15a9db3f46e2e24d1d5c72e9ca5dfe0b;hp=8aed204d71276795ae9bcaf408b01920b858ee7e;hpb=5eb4a701f3c233b0f49b581b3350eb6fdf3c1012;p=ardour.git diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc index 8aed204d71..69f3cb32c1 100644 --- a/libs/ardour/crossfade.cc +++ b/libs/ardour/crossfade.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Paul Davis + Copyright (C) 2003-2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,6 +20,8 @@ #include +#include + #include #include #include @@ -33,10 +35,11 @@ using namespace std; using namespace ARDOUR; -//using namespace sigc; +using namespace PBD; -jack_nframes_t Crossfade::_short_xfade_length = 0; -Change Crossfade::ActiveChanged = ARDOUR::new_change(); +nframes_t Crossfade::_short_xfade_length = 0; +Change Crossfade::ActiveChanged = new_change(); +Change 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. @@ -46,7 +49,7 @@ Sample* Crossfade::crossfade_buffer_out = 0; Sample* Crossfade::crossfade_buffer_in = 0; void -Crossfade::set_buffer_size (jack_nframes_t sz) +Crossfade::set_buffer_size (nframes_t sz) { if (crossfade_buffer_out) { delete [] crossfade_buffer_out; @@ -70,26 +73,31 @@ Crossfade::operator== (const Crossfade& other) return (_in == other._in) && (_out == other._out); } -Crossfade::Crossfade (ARDOUR::AudioRegion& in, ARDOUR::AudioRegion& out, - jack_nframes_t length, - jack_nframes_t position, +Crossfade::Crossfade (boost::shared_ptr in, boost::shared_ptr out, + nframes_t length, + nframes_t position, AnchorPoint ap) : _fade_in (0.0, 2.0, 1.0), // linear (gain coefficient) => -inf..+6dB _fade_out (0.0, 2.0, 1.0) // linear (gain coefficient) => -inf..+6dB { - _in = ∈ - _out = &out; + _in = in; + _out = out; + _length = length; _position = position; _anchor_point = ap; + _follow_overlap = false; - _active = true; + + cerr << "A: follow overlap = " << _follow_overlap << endl; + + _active = Config->get_xfades_active (); _fixed = true; initialize (); } -Crossfade::Crossfade (ARDOUR::AudioRegion& a, ARDOUR::AudioRegion& b, CrossfadeModel model, bool act) +Crossfade::Crossfade (boost::shared_ptr a, boost::shared_ptr b, CrossfadeModel model, bool act) : _fade_in (0.0, 2.0, 1.0), // linear (gain coefficient) => -inf..+6dB _fade_out (0.0, 2.0, 1.0) // linear (gain coefficient) => -inf..+6dB { @@ -104,15 +112,15 @@ Crossfade::Crossfade (ARDOUR::AudioRegion& a, ARDOUR::AudioRegion& b, CrossfadeM initialize (); + cerr << "K: follow overlap = " << _follow_overlap << endl; } Crossfade::Crossfade (const Playlist& playlist, XMLNode& node) : _fade_in (0.0, 2.0, 1.0), // linear (gain coefficient) => -inf..+6dB _fade_out (0.0, 2.0, 1.0) // linear (gain coefficient) => -inf..+6dB { - Region* r; + boost::shared_ptr r; XMLProperty* prop; - id_t id; LocaleGuard lg (X_("POSIX")); /* we have to find the in/out regions before we can do anything else */ @@ -122,7 +130,7 @@ Crossfade::Crossfade (const Playlist& playlist, XMLNode& node) throw failed_constructor(); } - sscanf (prop->value().c_str(), "%" PRIu64, &id); + 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()) @@ -130,7 +138,7 @@ Crossfade::Crossfade (const Playlist& playlist, XMLNode& node) throw failed_constructor(); } - if ((_in = dynamic_cast (r)) == 0) { + if ((_in = boost::dynamic_pointer_cast (r)) == 0) { throw failed_constructor(); } @@ -139,37 +147,70 @@ Crossfade::Crossfade (const Playlist& playlist, XMLNode& node) throw failed_constructor(); } - sscanf (prop->value().c_str(), "%" PRIu64, &id); + PBD::ID id2 (prop->value()); - if ((r = playlist.find_region (id)) == 0) { - error << string_compose (_("Crossfade: no \"out\" region %1 found in playlist %2"), id, playlist.name()) + if ((r = playlist.find_region (id2)) == 0) { + error << string_compose (_("Crossfade: no \"out\" region %1 found in playlist %2"), id2, playlist.name()) << endmsg; throw failed_constructor(); } - if ((_out = dynamic_cast (r)) == 0) { + if ((_out = boost::dynamic_pointer_cast (r)) == 0) { throw failed_constructor(); } _length = 0; - initialize(false); + _active = Config->get_xfades_active(); + + initialize(); if (set_state (node)) { throw failed_constructor(); } - save_state ("initial"); + cerr << "D: follow overlap = " << _follow_overlap << endl; + +} + +Crossfade::Crossfade (const Crossfade &orig, boost::shared_ptr newin, boost::shared_ptr newout) + : _fade_in(orig._fade_in), + _fade_out(orig._fade_out) +{ + _active = orig._active; + _in_update = orig._in_update; + _length = orig._length; + _position = orig._position; + _anchor_point = orig._anchor_point; + _follow_overlap = orig._follow_overlap; + _fixed = orig._fixed; + + _in = newin; + _out = newout; + + // copied from Crossfade::initialize() + _in_update = false; + + _out->suspend_fade_out (); + _in->suspend_fade_in (); + + overlap_type = _in->coverage (_out->position(), _out->last_frame()); + + // Let's make sure the fade isn't too long + set_length(_length); + + cerr << "B: follow overlap = " << _follow_overlap << endl; + } + Crossfade::~Crossfade () { - for (StateMap::iterator i = states.begin(); i != states.end(); ++i) { - delete *i; - } + cerr << this << " Crossfade deleted\n"; + notify_callbacks (); } void -Crossfade::initialize (bool savestate) +Crossfade::initialize () { _in_update = false; @@ -196,37 +237,33 @@ Crossfade::initialize (bool savestate) _fade_in.add (_length, 1.0); _fade_in.thaw (); -// _in->StateChanged.connect (slot (*this, &Crossfade::member_changed)); -// _out->StateChanged.connect (slot (*this, &Crossfade::member_changed)); + _in->StateChanged.connect (sigc::mem_fun (*this, &Crossfade::member_changed)); + _out->StateChanged.connect (sigc::mem_fun (*this, &Crossfade::member_changed)); overlap_type = _in->coverage (_out->position(), _out->last_frame()); - - if (savestate) { - save_state ("initial"); - } } int -Crossfade::compute (AudioRegion& a, AudioRegion& b, CrossfadeModel model) +Crossfade::compute (boost::shared_ptr a, boost::shared_ptr b, CrossfadeModel model) { - AudioRegion* top; - AudioRegion* bottom; - jack_nframes_t short_xfade_length; + boost::shared_ptr top; + boost::shared_ptr bottom; + nframes_t short_xfade_length; short_xfade_length = _short_xfade_length; - if (a.layer() < b.layer()) { - top = &b; - bottom = &a; + if (a->layer() < b->layer()) { + top = b; + bottom = a; } else { - top = &a; - bottom = &b; + top = a; + bottom = b; } /* first check for matching ends */ if (top->first_frame() == bottom->first_frame()) { - + /* Both regions start at the same point */ if (top->last_frame() < bottom->last_frame()) { @@ -327,15 +364,16 @@ Crossfade::compute (AudioRegion& a, AudioRegion& b, CrossfadeModel model) _in = bottom; _out = top; - _position = bottom->first_frame(); _anchor_point = StartOfIn; if (model == FullCrossfade) { + _position = bottom->first_frame(); // "{" _length = _out->first_frame() + _out->length() - _in->first_frame(); /* leave active alone */ _follow_overlap = true; } else { _length = min (short_xfade_length, top->length()); + _position = top->last_frame() - _length; // "]" - length _active = true; _follow_overlap = false; @@ -371,13 +409,13 @@ Crossfade::compute (AudioRegion& a, AudioRegion& b, CrossfadeModel model) return 0; } -jack_nframes_t +nframes_t Crossfade::read_at (Sample *buf, Sample *mixdown_buffer, - float *gain_buffer, jack_nframes_t start, jack_nframes_t cnt, uint32_t chan_n, - jack_nframes_t read_frames, jack_nframes_t skip_frames) + float *gain_buffer, nframes_t start, nframes_t cnt, uint32_t chan_n, + nframes_t read_frames, nframes_t skip_frames) { - jack_nframes_t offset; - jack_nframes_t to_write; + nframes_t offset; + nframes_t to_write; if (!_active) { return 0; @@ -424,7 +462,7 @@ Crossfade::read_at (Sample *buf, Sample *mixdown_buffer, position and length, and so we know precisely how much data they could return. */ - for (jack_nframes_t n = 0; n < to_write; ++n) { + for (nframes_t n = 0; n < to_write; ++n) { buf[n] = (crossfade_buffer_out[n] * fov[n]) + (crossfade_buffer_in[n] * fiv[n]); } @@ -435,9 +473,9 @@ Crossfade::read_at (Sample *buf, Sample *mixdown_buffer, } OverlapType -Crossfade::coverage (jack_nframes_t start, jack_nframes_t end) const +Crossfade::coverage (nframes_t start, nframes_t end) const { - jack_nframes_t my_end = _position + _length; + nframes_t my_end = _position + _length; if ((start >= _position) && (end <= my_end)) { return OverlapInternal; @@ -459,8 +497,7 @@ Crossfade::set_active (bool yn) { if (_active != yn) { _active = yn; - save_state (_("active changed")); - send_state_changed (ActiveChanged); + StateChanged (ActiveChanged); } } @@ -470,30 +507,27 @@ Crossfade::refresh () /* crossfades must be between non-muted regions */ if (_out->muted() || _in->muted()) { - Invalidated (this); + Invalidated (shared_from_this()); return false; } +// if (_in->layer() < _out->layer()) { +// cerr << this << " layer change, invalidated, in on " << _in->layer() << " out on " << _out->layer() << endl; +// Invalidated (shared_from_this()); +// return false; +// } + /* overlap type must be Start, End or External */ OverlapType ot; ot = _in->coverage (_out->first_frame(), _out->last_frame()); - - switch (ot) { - case OverlapNone: - case OverlapInternal: - Invalidated (this); - return false; - - default: - break; - } - + /* overlap type must not have altered */ if (ot != overlap_type) { - Invalidated (this); + cerr << this << " Invalid B\n"; + Invalidated (shared_from_this()); return false; } @@ -505,17 +539,20 @@ Crossfade::refresh () bool Crossfade::update (bool force) { - jack_nframes_t newlen; - bool save = false; + nframes_t newlen; + + cerr << this << " update, " << _in->name() << " + " << _out->name() << " length = " << _length << endl; if (_follow_overlap) { newlen = _out->first_frame() + _out->length() - _in->first_frame(); + cerr << "\tmodify length\n"; } else { newlen = _length; } if (newlen == 0) { - Invalidated (this); + cerr << this << " Invalid C\n"; + Invalidated (shared_from_this()); return false; } @@ -530,41 +567,28 @@ Crossfade::update (bool force) _length = newlen; - save = true; - } + cerr << "\tFover = " << _follow_overlap << endl; + switch (_anchor_point) { case StartOfIn: - if (_position != _in->first_frame()) { - _position = _in->first_frame(); - save = true; - } + _position = _in->first_frame(); break; case EndOfIn: - if (_position != _in->last_frame() - _length) { - _position = _in->last_frame() - _length; - save = true; - } + _position = _in->last_frame() - _length; break; case EndOfOut: - if (_position != _out->last_frame() - _length) { - _position = _out->last_frame() - _length; - save = true; - } + _position = _out->last_frame() - _length; } - if (save) { - save_state ("updated"); - } - /* UI's may need to know that the overlap changed even though the xfade length did not. */ - send_state_changed (BoundsChanged); /* EMIT SIGNAL */ + StateChanged (BoundsChanged); /* EMIT SIGNAL */ _in_update = false; @@ -576,72 +600,13 @@ Crossfade::member_changed (Change what_changed) { Change what_we_care_about = Change (Region::MuteChanged| Region::LayerChanged| - ARDOUR::BoundsChanged); + BoundsChanged); if (what_changed & what_we_care_about) { refresh (); } } -Change -Crossfade::restore_state (StateManager::State& state) -{ - CrossfadeState* xfstate = dynamic_cast (&state); - Change what_changed = Change (0); - - _in_update = true; - - xfstate->fade_in_memento (); - xfstate->fade_out_memento (); - - if (_length != xfstate->length) { - what_changed = Change (what_changed|LengthChanged); - _length = xfstate->length; - } - if (_active != xfstate->active) { - what_changed = Change (what_changed|ActiveChanged); - _active = xfstate->active; - } - if (_position != xfstate->position) { - what_changed = Change (what_changed|PositionChanged); - _position = xfstate->position; - } - - /* XXX what to do about notifications for these? I don't - think (G)UI cares about them because they are - implicit in the bounds. - */ - - _follow_overlap = xfstate->follow_overlap; - _anchor_point = xfstate->anchor_point; - - _in_update = false; - - return Change (what_changed); -} - -StateManager::State* -Crossfade::state_factory (std::string why) const -{ - CrossfadeState* state = new CrossfadeState (why); - - state->fade_in_memento = _fade_in.get_memento (); - state->fade_out_memento = _fade_out.get_memento (); - state->active = _active; - state->length = _length; - state->position = _position; - state->follow_overlap = _follow_overlap; - state->anchor_point = _anchor_point; - - return state; -} - -UndoAction -Crossfade::get_memento() const -{ - return sigc::bind (mem_fun (*(const_cast (this)), &StateManager::use_state), _current_state_id); -} - XMLNode& Crossfade::get_state () { @@ -650,9 +615,9 @@ Crossfade::get_state () char buf[64]; LocaleGuard lg (X_("POSIX")); - snprintf (buf, sizeof(buf), "%" PRIu64, _out->id()); + _out->id().print (buf, sizeof (buf)); node->add_property ("out", buf); - snprintf (buf, sizeof(buf), "%" PRIu64, _in->id()); + _in->id().print (buf, sizeof (buf)); node->add_property ("in", buf); node->add_property ("active", (_active ? "yes" : "no")); node->add_property ("follow-overlap", (_follow_overlap ? "yes" : "no")); @@ -671,9 +636,9 @@ Crossfade::get_state () pnode = new XMLNode ("point"); - snprintf (buf, sizeof (buf), "%" PRIu32, (jack_nframes_t) floor ((*ii)->when)); + snprintf (buf, sizeof (buf), "%" PRIu32, (nframes_t) floor ((*ii)->when)); pnode->add_property ("x", buf); - snprintf (buf, sizeof (buf), "%f", (*ii)->value); + snprintf (buf, sizeof (buf), "%.12g", (*ii)->value); pnode->add_property ("y", buf); child->add_child_nocopy (*pnode); } @@ -685,9 +650,9 @@ Crossfade::get_state () pnode = new XMLNode ("point"); - snprintf (buf, sizeof (buf), "%" PRIu32, (jack_nframes_t) floor ((*ii)->when)); + snprintf (buf, sizeof (buf), "%" PRIu32, (nframes_t) floor ((*ii)->when)); pnode->add_property ("x", buf); - snprintf (buf, sizeof (buf), "%f", (*ii)->value); + snprintf (buf, sizeof (buf), "%.12g", (*ii)->value); pnode->add_property ("y", buf); child->add_child_nocopy (*pnode); } @@ -704,16 +669,26 @@ Crossfade::set_state (const XMLNode& node) XMLNode* fo; const XMLProperty* prop; LocaleGuard lg (X_("POSIX")); + Change what_changed = Change (0); + nframes_t val; if ((prop = node.property ("position")) != 0) { - _position = atoi (prop->value().c_str()); + sscanf (prop->value().c_str(), "%" PRIu32, &val); + if (val != _position) { + _position = val; + what_changed = Change (what_changed | PositionChanged); + } } else { warning << _("old-style crossfade information - no position information") << endmsg; _position = _in->first_frame(); } if ((prop = node.property ("active")) != 0) { - _active = (prop->value() == "yes"); + bool x = (prop->value() == "yes"); + if (x != _active) { + _active = x; + what_changed = Change (what_changed | ActiveChanged); + } } else { _active = true; } @@ -738,7 +713,11 @@ Crossfade::set_state (const XMLNode& node) if ((prop = node.property ("length")) != 0) { - _length = atol (prop->value().c_str()); + sscanf (prop->value().c_str(), "%" PRIu32, &val); + if (val != _length) { + _length = atol (prop->value().c_str()); + what_changed = Change (what_changed | LengthChanged); + } } else { @@ -761,13 +740,14 @@ Crossfade::set_state (const XMLNode& node) /* fade in */ + _fade_in.freeze (); _fade_in.clear (); children = fi->children(); for (i = children.begin(); i != children.end(); ++i) { if ((*i)->name() == "point") { - jack_nframes_t x; + nframes_t x; float y; prop = (*i)->property ("x"); @@ -779,16 +759,19 @@ Crossfade::set_state (const XMLNode& node) _fade_in.add (x, y); } } + + _fade_in.thaw (); /* fade out */ + _fade_out.freeze (); _fade_out.clear (); children = fo->children(); for (i = children.begin(); i != children.end(); ++i) { if ((*i)->name() == "point") { - jack_nframes_t x; + nframes_t x; float y; XMLProperty* prop; @@ -802,6 +785,10 @@ Crossfade::set_state (const XMLNode& node) } } + _fade_out.thaw (); + + StateChanged (what_changed); /* EMIT SIGNAL */ + return 0; } @@ -825,12 +812,14 @@ Crossfade::set_follow_overlap (bool yn) } else { set_length (_out->first_frame() + _out->length() - _in->first_frame()); } + + StateChanged (FollowOverlapChanged); } -jack_nframes_t -Crossfade::set_length (jack_nframes_t len) +nframes_t +Crossfade::set_length (nframes_t len) { - jack_nframes_t limit; + nframes_t limit; switch (_anchor_point) { case StartOfIn: @@ -858,14 +847,12 @@ Crossfade::set_length (jack_nframes_t len) _length = len; - save_state ("length changed"); - - send_state_changed (LengthChanged); + StateChanged (LengthChanged); return len; } -jack_nframes_t +nframes_t Crossfade::overlap_length () const { if (_fixed) { @@ -875,7 +862,13 @@ Crossfade::overlap_length () const } void -Crossfade::set_short_xfade_length (jack_nframes_t n) +Crossfade::set_short_xfade_length (nframes_t n) { _short_xfade_length = n; } + +void +Crossfade::invalidate () +{ + Invalidated (shared_from_this()); /* EMIT SIGNAL */ +}