not actually working attempt to copy relevant xfades into compound regions; fix compi...
[ardour.git] / libs / ardour / audio_playlist.cc
index 93bdc333f134413a67faf1ab5e2b91ca3c4beb72..e120ebb5ab15cf097bcffe078965cd9186d3e84d 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2003 Paul Davis 
+    Copyright (C) 2003 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
 
 #include <cstdlib>
 
-#include <sigc++/bind.h>
-
 #include "ardour/types.h"
+#include "ardour/debug.h"
 #include "ardour/configuration.h"
 #include "ardour/audioplaylist.h"
 #include "ardour/audioregion.h"
 #include "ardour/crossfade.h"
-#include "ardour/crossfade_compare.h"
 #include "ardour/session.h"
 #include "pbd/enumwriter.h"
 
 #include "i18n.h"
 
 using namespace ARDOUR;
-using namespace sigc;
 using namespace std;
 using namespace PBD;
 
+namespace ARDOUR {
+       namespace Properties {
+               PBD::PropertyDescriptor<bool> crossfades;
+       }
+}
+
+void
+AudioPlaylist::make_property_quarks ()
+{
+        Properties::crossfades.property_id = g_quark_from_static_string (X_("crossfades"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for crossfades = %1\n", Properties::crossfades.property_id));
+}
+
+CrossfadeListProperty::CrossfadeListProperty (AudioPlaylist& pl)
+        : SequenceProperty<std::list<boost::shared_ptr<Crossfade> > > (Properties::crossfades.property_id, boost::bind (&AudioPlaylist::update, &pl, _1))
+        , _playlist (pl)
+{
+       
+}
+
+CrossfadeListProperty::CrossfadeListProperty (CrossfadeListProperty const & p)
+       : PBD::SequenceProperty<std::list<boost::shared_ptr<Crossfade> > > (p)
+       , _playlist (p._playlist)
+{
+
+}
+
+
+CrossfadeListProperty *
+CrossfadeListProperty::create () const
+{
+       return new CrossfadeListProperty (_playlist);
+}
+
+CrossfadeListProperty *
+CrossfadeListProperty::clone () const
+{
+       return new CrossfadeListProperty (*this);
+}
+
+void
+CrossfadeListProperty::get_content_as_xml (boost::shared_ptr<Crossfade> xfade, XMLNode & node) const
+{
+       /* Crossfades are not written to any state when they are no
+          longer in use, so we must write their state here.
+       */
+
+       XMLNode& c = xfade->get_state ();
+       node.add_child_nocopy (c);
+}
+
+boost::shared_ptr<Crossfade>
+CrossfadeListProperty::get_content_from_xml (XMLNode const & node) const
+{
+       XMLNodeList const c = node.children ();
+       assert (c.size() == 1);
+       return boost::shared_ptr<Crossfade> (new Crossfade (_playlist, *c.front()));
+}
+
+
 AudioPlaylist::AudioPlaylist (Session& session, const XMLNode& node, bool hidden)
        : Playlist (session, node, DataType::AUDIO, hidden)
+       , _crossfades (*this)
 {
+#ifndef NDEBUG
        const XMLProperty* prop = node.property("type");
        assert(!prop || DataType(prop->value()) == DataType::AUDIO);
+#endif
+
+       add_property (_crossfades);
 
        in_set_state++;
-       set_state (node);
+       set_state (node, Stateful::loading_state_version);
        in_set_state--;
 }
 
 AudioPlaylist::AudioPlaylist (Session& session, string name, bool hidden)
        : Playlist (session, name, DataType::AUDIO, hidden)
+       , _crossfades (*this)
 {
+       add_property (_crossfades);
 }
 
 AudioPlaylist::AudioPlaylist (boost::shared_ptr<const AudioPlaylist> other, string name, bool hidden)
        : Playlist (other, name, hidden)
+       , _crossfades (*this)
 {
+       add_property (_crossfades);
+       
        RegionList::const_iterator in_o  = other->regions.begin();
        RegionList::iterator in_n = regions.begin();
 
@@ -73,9 +140,9 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr<const AudioPlaylist> other, stri
                                RegionList::const_iterator out_n = regions.begin();
 
                                while (out_o != other->regions.end()) {
-                                       
+
                                        boost::shared_ptr<AudioRegion>ar2 = boost::dynamic_pointer_cast<AudioRegion>(*out_o);
-                                       
+
                                        if ((*xfades)->out() == ar2) {
                                                boost::shared_ptr<AudioRegion>in  = boost::dynamic_pointer_cast<AudioRegion>(*in_n);
                                                boost::shared_ptr<AudioRegion>out = boost::dynamic_pointer_cast<AudioRegion>(*out_n);
@@ -83,7 +150,7 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr<const AudioPlaylist> other, stri
                                                add_crossfade(new_fade);
                                                break;
                                        }
-                                       
+
                                        out_o++;
                                        out_n++;
                                }
@@ -96,20 +163,96 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr<const AudioPlaylist> other, stri
        }
 }
 
-AudioPlaylist::AudioPlaylist (boost::shared_ptr<const AudioPlaylist> other, nframes_t start, nframes_t cnt, string name, bool hidden)
+AudioPlaylist::AudioPlaylist (boost::shared_ptr<const AudioPlaylist> other, framepos_t start, framecnt_t cnt, string name, bool hidden)
        : Playlist (other, start, cnt, name, hidden)
+       , _crossfades (*this)
 {
+       RegionLock rlock2 (const_cast<AudioPlaylist*> (other.get()));
+       in_set_state++;
+       
+       add_property (_crossfades);
+
+       framepos_t const end = start + cnt - 1;
+
+       /* Audio regions that have been created by the Playlist constructor
+          will currently have the same fade in/out as the regions that they
+          were created from.  This is wrong, so reset the fades here.
+       */
+
+       RegionList::iterator ours = regions.begin ();
+
+       for (RegionList::const_iterator i = other->regions.begin(); i != other->regions.end(); ++i) {
+               boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (*i);
+               assert (region);
+
+               framecnt_t fade_in = 64;
+               framecnt_t fade_out = 64;
+               framepos_t position;
+               framecnt_t len;
+               frameoffset_t offset;
+
+               switch (region->coverage (start, end)) {
+               case OverlapNone:
+                       continue;
+
+               case OverlapInternal:
+               {
+                       framecnt_t const offset = start - region->position ();
+                       framecnt_t const trim = region->last_frame() - end;
+                       if (region->fade_in()->back()->when > offset) {
+                               fade_in = region->fade_in()->back()->when - offset;
+                       }
+                       if (region->fade_out()->back()->when > trim) {
+                               fade_out = region->fade_out()->back()->when - trim;
+                       }
+                       break;
+               }
+
+               case OverlapStart: {
+                       position = region->position() - start;
+                       len = end - region->position();
+
+                       if (end > region->position() + region->fade_in()->back()->when)
+                               fade_in = region->fade_in()->back()->when;  //end is after fade-in, preserve the fade-in
+                       if (end > region->last_frame() - region->fade_out()->back()->when)
+                               fade_out = region->fade_out()->back()->when - ( region->last_frame() - end );  //end is inside the fadeout, preserve the fades endpoint
+                       break;
+               }
+               
+               case OverlapEnd: {
+                       position = 0;
+                       offset = start - region->position();
+                       len = region->length() - offset;
+
+                       if (start < region->last_frame() - region->fade_out()->back()->when)  //start is before fade-out, preserve the fadeout
+                               fade_out = region->fade_out()->back()->when;
+                       
+                       if (start < region->position() + region->fade_in()->back()->when)
+                               fade_in = region->fade_in()->back()->when - (start - region->position());  //end is inside the fade-in, preserve the fade-in endpoint
+                       break;
+               }
+               
+               case OverlapExternal:
+                       fade_in = region->fade_in()->back()->when;
+                       fade_out = region->fade_out()->back()->when;
+                       break;
+               }
+
+               boost::shared_ptr<AudioRegion> our_region = boost::dynamic_pointer_cast<AudioRegion> (*ours);
+               assert (our_region);
+
+               our_region->set_fade_in_length (fade_in);
+               our_region->set_fade_out_length (fade_out);
+               ++ours;
+       }
+
+       in_set_state--;
+
        /* this constructor does NOT notify others (session) */
 }
 
 AudioPlaylist::~AudioPlaylist ()
 {
-       GoingAway (); /* EMIT SIGNAL */
-
-       /* drop connections to signals */
-
-       notify_callbacks ();
-       
        _crossfades.clear ();
 }
 
@@ -119,19 +262,16 @@ struct RegionSortByLayer {
     }
 };
 
-ARDOUR::nframes_t
-AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nframes_t start,
-                    nframes_t cnt, unsigned chan_n)
+ARDOUR::framecnt_t
+AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, framepos_t start,
+                    framecnt_t cnt, unsigned chan_n)
 {
-       nframes_t ret = cnt;
-       nframes_t end;
-       nframes_t read_frames;
-       nframes_t skip_frames;
+       framecnt_t ret = cnt;
 
        /* optimizing this memset() away involves a lot of conditionals
-          that may well cause more of a hit due to cache misses 
+          that may well cause more of a hit due to cache misses
           and related stuff than just doing this here.
-          
+
           it would be great if someone could measure this
           at some point.
 
@@ -143,15 +283,15 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf
 
        memset (buf, 0, sizeof (Sample) * cnt);
 
-       /* this function is never called from a realtime thread, so 
+       /* this function is never called from a realtime thread, so
           its OK to block (for short intervals).
        */
 
        Glib::RecMutex::Lock rm (region_lock);
 
-       end =  start + cnt - 1;
-       read_frames = 0;
-       skip_frames = 0;
+       framepos_t const end = start + cnt - 1;
+       framecnt_t read_frames = 0;
+       framecnt_t skip_frames = 0;
        _read_data_count = 0;
 
        _read_data_count = 0;
@@ -171,7 +311,7 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf
                if ((*i)->coverage (start, end) != OverlapNone) {
                        relevant_regions[(*i)->layer()].push_back (*i);
                        relevant_layers.push_back ((*i)->layer());
-               }
+                }
        }
 
        for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); ++i) {
@@ -196,13 +336,15 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf
                vector<boost::shared_ptr<Region> > r (relevant_regions[*l]);
                vector<boost::shared_ptr<Crossfade> >& x (relevant_xfades[*l]);
 
+
                for (vector<boost::shared_ptr<Region> >::iterator i = r.begin(); i != r.end(); ++i) {
                        boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(*i);
+                        DEBUG_TRACE (DEBUG::AudioPlayback, string_compose ("read from region %1\n", ar->name()));
                        assert(ar);
                        ar->read_at (buf, mixdown_buffer, gain_buffer, start, cnt, chan_n, read_frames, skip_frames);
                        _read_data_count += ar->read_data_count();
                }
-               
+
                for (vector<boost::shared_ptr<Crossfade> >::iterator i = x.begin(); i != x.end(); ++i) {
                        (*i)->read_at (buf, mixdown_buffer, gain_buffer, start, cnt, chan_n);
 
@@ -225,7 +367,7 @@ AudioPlaylist::remove_dependents (boost::shared_ptr<Region> region)
        if (in_set_state) {
                return;
        }
-       
+
        if (r == 0) {
                fatal << _("programming error: non-audio Region passed to remove_overlap in audio playlist")
                      << endmsg;
@@ -233,7 +375,7 @@ AudioPlaylist::remove_dependents (boost::shared_ptr<Region> region)
        }
 
        for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); ) {
-               
+
                if ((*i)->involves (r)) {
                        i = _crossfades.erase (i);
                } else {
@@ -244,9 +386,9 @@ AudioPlaylist::remove_dependents (boost::shared_ptr<Region> region)
 
 
 void
-AudioPlaylist::flush_notifications ()
+AudioPlaylist::flush_notifications (bool from_undo)
 {
-       Playlist::flush_notifications();
+       Playlist::flush_notifications (from_undo);
 
        if (in_flush) {
                return;
@@ -260,7 +402,7 @@ AudioPlaylist::flush_notifications ()
        }
 
        _pending_xfade_adds.clear ();
-       
+
        in_flush = false;
 }
 
@@ -277,7 +419,7 @@ AudioPlaylist::refresh_dependents (boost::shared_ptr<Region> r)
        for (Crossfades::iterator x = _crossfades.begin(); x != _crossfades.end();) {
 
                Crossfades::iterator tmp;
-               
+
                tmp = x;
                ++tmp;
 
@@ -286,7 +428,7 @@ AudioPlaylist::refresh_dependents (boost::shared_ptr<Region> r)
                if ((*x)->involves (ar)) {
 
                        pair<set<boost::shared_ptr<Crossfade> >::iterator, bool> const u = updated.insert (*x);
-                       
+
                        if (u.second) {
                                /* x was successfully inserted into the set, so it has not already been updated */
                                try {
@@ -316,7 +458,7 @@ AudioPlaylist::finalize_split_region (boost::shared_ptr<Region> o, boost::shared
                ++tmp;
 
                boost::shared_ptr<Crossfade> fade;
-               
+
                if ((*x)->_in == orig) {
                        if (! (*x)->covers(right->position())) {
                                fade = boost::shared_ptr<Crossfade> (new Crossfade (*x, left, (*x)->_out));
@@ -325,7 +467,7 @@ AudioPlaylist::finalize_split_region (boost::shared_ptr<Region> o, boost::shared
                                fade = boost::shared_ptr<Crossfade> (new Crossfade (*x, right, (*x)->_out));
                        }
                }
-               
+
                if ((*x)->_out == orig) {
                        if (! (*x)->covers(right->position())) {
                                fade = boost::shared_ptr<Crossfade> (new Crossfade (*x, (*x)->_in, right));
@@ -334,7 +476,7 @@ AudioPlaylist::finalize_split_region (boost::shared_ptr<Region> o, boost::shared
                                fade = boost::shared_ptr<Crossfade> (new Crossfade (*x, (*x)->_in, left));
                        }
                }
-               
+
                if (fade) {
                        _crossfades.remove (*x);
                        add_crossfade (fade);
@@ -351,7 +493,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
        boost::shared_ptr<AudioRegion> top;
        boost::shared_ptr<AudioRegion> bottom;
        boost::shared_ptr<Crossfade>   xfade;
-       RegionList*  touched_regions;
+       RegionList*  touched_regions = 0;
 
        if (in_set_state || in_partition) {
                return;
@@ -373,9 +515,6 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
        }
 
        for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
-
-               nframes_t xfade_length;
-
                other = boost::dynamic_pointer_cast<AudioRegion> (*i);
 
                if (other == region) {
@@ -385,7 +524,11 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
                if (other->muted() || region->muted()) {
                        continue;
                }
-               
+
+                if (other->position() == r->position() && other->length() == r->length()) {
+                        /* precise overlay of two regions - no xfade */
+                        continue;
+                }
 
                if (other->layer() < region->layer()) {
                        top = region;
@@ -401,7 +544,11 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
 
                OverlapType c = top->coverage (bottom->position(), bottom->last_frame());
 
+               delete touched_regions;
+               touched_regions = 0;
+
                try {
+                       framecnt_t xfade_length;
                        switch (c) {
                        case OverlapNone:
                                break;
@@ -413,41 +560,41 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
                                break;
 
                        case OverlapExternal:
+
                                /*     [ -------- top ------- ]
                                 * {=========== bottom =============}
                                 */
-                               
+
                                /* to avoid discontinuities at the region boundaries of an internal
                                   overlap (this region is completely within another), we create
                                   two hidden crossfades at each boundary. this is not dependent
                                   on the auto-xfade option, because we require it as basic
                                   audio engineering.
                                */
-                               
-                               xfade_length = min ((nframes_t) 720, top->length());
+
+                               xfade_length = min ((framecnt_t) 720, top->length());
 
                                if (top_region_at (top->first_frame()) == top) {
+
                                        xfade = boost::shared_ptr<Crossfade> (new Crossfade (top, bottom, xfade_length, top->first_frame(), StartOfIn));
                                        add_crossfade (xfade);
                                }
 
                                if (top_region_at (top->last_frame() - 1) == top) {
 
-                                       /* 
-                                          only add a fade out if there is no region on top of the end of 'top' (which 
+                                       /*
+                                          only add a fade out if there is no region on top of the end of 'top' (which
                                           would cover it).
                                        */
-                                       
+
                                        xfade = boost::shared_ptr<Crossfade> (new Crossfade (bottom, top, xfade_length, top->last_frame() - xfade_length, EndOfOut));
                                        add_crossfade (xfade);
                                }
                                break;
                        case OverlapStart:
 
-                               /*                   { ==== top ============ } 
-                                *   [---- bottom -------------------] 
+                               /*                   { ==== top ============ }
+                                *   [---- bottom -------------------]
                                 */
 
                                if (_session.config.get_xfade_model() == FullCrossfade) {
@@ -458,8 +605,8 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
                                        }
                                } else {
 
-                                       touched_regions = regions_touched (top->first_frame(), 
-                                                                          top->first_frame() + min ((nframes_t)_session.config.get_short_xfade_seconds() * _session.frame_rate(), 
+                                       touched_regions = regions_touched (top->first_frame(),
+                                                                          top->first_frame() + min ((framecnt_t) _session.config.get_short_xfade_seconds() * _session.frame_rate(),
                                                                                                     top->length()));
                                        if (touched_regions->size() <= 2) {
                                                xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other, _session.config.get_xfade_model(), _session.config.get_xfades_active()));
@@ -470,22 +617,22 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
                        case OverlapEnd:
 
 
-                               /* [---- top ------------------------] 
-                                *                { ==== bottom ============ } 
-                                */ 
+                               /* [---- top ------------------------]
+                                *                { ==== bottom ============ }
+                                */
 
                                if (_session.config.get_xfade_model() == FullCrossfade) {
 
                                        touched_regions = regions_touched (bottom->first_frame(), top->last_frame());
                                        if (touched_regions->size() <= 2) {
-                                               xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other, 
+                                               xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other,
                                                                                                     _session.config.get_xfade_model(), _session.config.get_xfades_active()));
                                                add_crossfade (xfade);
                                        }
 
                                } else {
-                                       touched_regions = regions_touched (bottom->first_frame(), 
-                                                                          bottom->first_frame() + min ((nframes_t)_session.config.get_short_xfade_seconds() * _session.frame_rate(), 
+                                       touched_regions = regions_touched (bottom->first_frame(),
+                                                                          bottom->first_frame() + min ((framecnt_t)_session.config.get_short_xfade_seconds() * _session.frame_rate(),
                                                                                                        bottom->length()));
                                        if (touched_regions->size() <= 2) {
                                                xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other, _session.config.get_xfade_model(), _session.config.get_xfades_active()));
@@ -494,7 +641,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
                                }
                                break;
                        default:
-                               xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other, 
+                               xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other,
                                                                                     _session.config.get_xfade_model(), _session.config.get_xfades_active()));
                                add_crossfade (xfade);
                        }
@@ -503,12 +650,14 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
                catch (failed_constructor& err) {
                        continue;
                }
-               
+
                catch (Crossfade::NoCrossfadeHere& err) {
                        continue;
                }
-               
+
        }
+
+       delete touched_regions;
 }
 
 void
@@ -521,25 +670,24 @@ AudioPlaylist::add_crossfade (boost::shared_ptr<Crossfade> xfade)
                        break;
                }
        }
-       
+
        if (ci != _crossfades.end()) {
                // it will just go away
        } else {
                _crossfades.push_back (xfade);
 
-               xfade->Invalidated.connect (mem_fun (*this, &AudioPlaylist::crossfade_invalidated));
-               xfade->StateChanged.connect (mem_fun (*this, &AudioPlaylist::crossfade_changed));
+               xfade->Invalidated.connect_same_thread (*this, boost::bind (&AudioPlaylist::crossfade_invalidated, this, _1));
+               xfade->PropertyChanged.connect_same_thread (*this, boost::bind (&AudioPlaylist::crossfade_changed, this, _1));
 
                notify_crossfade_added (xfade);
        }
 }
-       
+
 void AudioPlaylist::notify_crossfade_added (boost::shared_ptr<Crossfade> x)
 {
        if (g_atomic_int_get(&block_notifications)) {
                _pending_xfade_adds.insert (_pending_xfade_adds.end(), x);
        } else {
-
                NewCrossfade (x); /* EMIT SIGNAL */
        }
 }
@@ -559,16 +707,17 @@ AudioPlaylist::crossfade_invalidated (boost::shared_ptr<Region> r)
 }
 
 int
-AudioPlaylist::set_state (const XMLNode& node)
+AudioPlaylist::set_state (const XMLNode& node, int version)
 {
        XMLNode *child;
        XMLNodeList nlist;
        XMLNodeConstIterator niter;
 
        in_set_state++;
-       freeze ();
 
-       Playlist::set_state (node);
+       Playlist::set_state (node, version);
+
+       freeze ();
 
        nlist = node.children();
 
@@ -583,14 +732,14 @@ AudioPlaylist::set_state (const XMLNode& node)
                try {
                        boost::shared_ptr<Crossfade> xfade = boost::shared_ptr<Crossfade> (new Crossfade (*((const Playlist *)this), *child));
                        _crossfades.push_back (xfade);
-                       xfade->Invalidated.connect (mem_fun (*this, &AudioPlaylist::crossfade_invalidated));
-                       xfade->StateChanged.connect (mem_fun (*this, &AudioPlaylist::crossfade_changed));
+                       xfade->Invalidated.connect_same_thread (*this, boost::bind (&AudioPlaylist::crossfade_invalidated, this, _1));
+                       xfade->PropertyChanged.connect_same_thread (*this, boost::bind (&AudioPlaylist::crossfade_changed, this, _1));
                        NewCrossfade(xfade);
                }
-               
+
                catch (failed_constructor& err) {
                        //      cout << string_compose (_("could not create crossfade object in playlist %1"),
-                       //        _name) 
+                       //        _name)
                        //    << endl;
                        continue;
                }
@@ -619,7 +768,7 @@ AudioPlaylist::state (bool full_state)
                        node.add_child_nocopy ((*i)->get_state());
                }
        }
-       
+
        return node;
 }
 
@@ -636,9 +785,9 @@ AudioPlaylist::dump () const
 
        for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
                r = *i;
-               cerr << "  " << r->name() << " @ " << r << " [" 
-                    << r->start() << "+" << r->length() 
-                    << "] at " 
+               cerr << "  " << r->name() << " @ " << r << " ["
+                    << r->start() << "+" << r->length()
+                    << "] at "
                     << r->position()
                     << " on layer "
                     << r->layer ()
@@ -647,13 +796,13 @@ AudioPlaylist::dump () const
 
        for (Crossfades::const_iterator i = _crossfades.begin(); i != _crossfades.end(); ++i) {
                x = *i;
-               cerr << "  xfade [" 
+               cerr << "  xfade ["
                     << x->out()->name()
                     << ','
                     << x->in()->name()
                     << " @ "
                     << x->position()
-                    << " length = " 
+                    << " length = "
                     << x->length ()
                     << " active ? "
                     << (x->active() ? "yes" : "no")
@@ -665,30 +814,28 @@ bool
 AudioPlaylist::destroy_region (boost::shared_ptr<Region> region)
 {
        boost::shared_ptr<AudioRegion> r = boost::dynamic_pointer_cast<AudioRegion> (region);
+
+        if (!r) {
+                return false;
+        }
+
        bool changed = false;
        Crossfades::iterator c, ctmp;
        set<boost::shared_ptr<Crossfade> > unique_xfades;
 
-       if (r == 0) {
-               fatal << _("programming error: non-audio Region passed to remove_overlap in audio playlist")
-                     << endmsg;
-               /*NOTREACHED*/
-               return false;
-       }
-
        {
                RegionLock rlock (this);
 
                for (RegionList::iterator i = regions.begin(); i != regions.end(); ) {
-                       
+
                        RegionList::iterator tmp = i;
                        ++tmp;
-                       
+
                        if ((*i) == region) {
                                regions.erase (i);
                                changed = true;
                        }
-                       
+
                        i = tmp;
                }
 
@@ -696,12 +843,12 @@ AudioPlaylist::destroy_region (boost::shared_ptr<Region> region)
 
                        set<boost::shared_ptr<Region> >::iterator xtmp = x;
                        ++xtmp;
-                       
+
                        if ((*x) == region) {
                                all_regions.erase (x);
                                changed = true;
                        }
-                       
+
                        x = xtmp;
                }
 
@@ -716,7 +863,7 @@ AudioPlaylist::destroy_region (boost::shared_ptr<Region> region)
                        unique_xfades.insert (*c);
                        _crossfades.erase (c);
                }
-               
+
                c = ctmp;
        }
 
@@ -729,7 +876,7 @@ AudioPlaylist::destroy_region (boost::shared_ptr<Region> region)
 }
 
 void
-AudioPlaylist::crossfade_changed (Change)
+AudioPlaylist::crossfade_changed (const PropertyChange&)
 {
        if (in_flush || in_set_state) {
                return;
@@ -741,56 +888,195 @@ AudioPlaylist::crossfade_changed (Change)
           that occured.
        */
 
-       notify_modified ();
+       notify_contents_changed ();
 }
 
 bool
-AudioPlaylist::region_changed (Change what_changed, boost::shared_ptr<Region> region)
+AudioPlaylist::region_changed (const PropertyChange& what_changed, boost::shared_ptr<Region> region)
 {
        if (in_flush || in_set_state) {
                return false;
        }
 
-       Change our_interests = Change (AudioRegion::FadeInChanged|
-                                      AudioRegion::FadeOutChanged|
-                                      AudioRegion::FadeInActiveChanged|
-                                      AudioRegion::FadeOutActiveChanged|
-                                      AudioRegion::EnvelopeActiveChanged|
-                                      AudioRegion::ScaleAmplitudeChanged|
-                                      AudioRegion::EnvelopeChanged);
+       PropertyChange our_interests;
+
+       our_interests.add (Properties::fade_in_active);
+       our_interests.add (Properties::fade_out_active);
+       our_interests.add (Properties::scale_amplitude);
+       our_interests.add (Properties::envelope_active);
+       our_interests.add (Properties::envelope);
+       our_interests.add (Properties::fade_in);
+       our_interests.add (Properties::fade_out);
+
        bool parent_wants_notify;
 
        parent_wants_notify = Playlist::region_changed (what_changed, region);
 
-       if ((parent_wants_notify || (what_changed & our_interests))) {
-               notify_modified ();
+       if (parent_wants_notify || (what_changed.contains (our_interests))) {
+               notify_contents_changed ();
        }
 
-       return true; 
+       return true;
 }
 
 void
-AudioPlaylist::crossfades_at (nframes_t frame, Crossfades& clist)
+AudioPlaylist::crossfades_at (framepos_t frame, Crossfades& clist)
 {
        RegionLock rlock (this);
 
        for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); ++i) {
-               nframes_t start, end;
-
-               start = (*i)->position();
-               end = start + (*i)->overlap_length(); // not length(), important difference
+               framepos_t const start = (*i)->position ();
+               framepos_t const end = start + (*i)->overlap_length(); // not length(), important difference
 
                if (frame >= start && frame <= end) {
                        clist.push_back (*i);
-               } 
+               }
        }
 }
 
 void
-AudioPlaylist::foreach_crossfade (sigc::slot<void, boost::shared_ptr<Crossfade> > s)
+AudioPlaylist::foreach_crossfade (boost::function<void (boost::shared_ptr<Crossfade>)> s)
 {
        RegionLock rl (this, false);
        for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); ++i) {
                s (*i);
        }
 }
+
+void
+AudioPlaylist::update (const CrossfadeListProperty::ChangeRecord& change)
+{
+       for (CrossfadeListProperty::ChangeContainer::const_iterator i = change.added.begin(); i != change.added.end(); ++i) {
+               add_crossfade (*i);
+       }
+
+       /* don't remove crossfades here; they will be dealt with by the dependency code */
+}
+
+boost::shared_ptr<Crossfade>
+AudioPlaylist::find_crossfade (const PBD::ID& id) const
+{
+       Crossfades::const_iterator i = _crossfades.begin ();
+       while (i != _crossfades.end() && (*i)->id() != id) {
+               ++i;
+       }
+
+       if (i == _crossfades.end()) {
+               return boost::shared_ptr<Crossfade> ();
+       }
+
+       return *i;
+}
+
+struct crossfade_triple {
+    boost::shared_ptr<Region> old_in;
+    boost::shared_ptr<Region> new_in;
+    boost::shared_ptr<Region> new_out;
+};
+
+void
+AudioPlaylist::copy_dependents (const vector<TwoRegions>& old_and_new, boost::shared_ptr<Playlist> other)
+{
+       boost::shared_ptr<AudioPlaylist> other_audio = boost::dynamic_pointer_cast<AudioPlaylist>(other);
+
+       if (!other_audio) {
+               return;
+       }
+
+       /* our argument is a vector of old and new regions. Each old region
+          might be participant in a crossfade that is already present. Each new
+          region is a copy of the old region, present in the other playlist.
+
+          our task is to find all the relevant xfades in our playlist (involving
+          the "old" regions) and place copies of them in the other playlist.
+       */
+
+       typedef map<boost::shared_ptr<Crossfade>,crossfade_triple> CrossfadeInfo;
+       CrossfadeInfo crossfade_info;
+
+       /* build up a record that links crossfades, old regions and new regions
+        */
+
+       for (vector<TwoRegions>::const_iterator on = old_and_new.begin(); on != old_and_new.end(); ++on) {
+
+               for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); ++i) {
+
+                       if ((*i)->in() == on->first) {
+                               
+                               CrossfadeInfo::iterator cf;
+
+                               if ((cf = crossfade_info.find (*i)) != crossfade_info.end()) {
+
+                                       /* already have a record for the old fade-in region, 
+                                          so note the new fade-in region
+                                       */
+                                       
+                                       cf->second.new_in = on->second;
+                                       
+                               } else {
+                                       
+                                       /* add a record of this crossfade, keeping an association
+                                          with the new fade-in region
+                                       */
+                                       
+                                       crossfade_triple ct;
+                                       
+                                       ct.old_in = on->first;
+                                       ct.new_in = on->second;
+
+                                       crossfade_info[*i] = ct;
+                               }
+
+                       } else if ((*i)->out() == on->first) {
+                               
+                               /* this old region is the fade-out region of this crossfade */
+                               
+                               CrossfadeInfo::iterator cf;
+                               
+                               if ((cf = crossfade_info.find (*i)) != crossfade_info.end()) {
+                                       
+                                       /* already have a record for this crossfade, so just keep
+                                          an association for the new fade out region
+                                       */
+                                       
+                                       cf->second.new_out = on->second;
+                                       
+                               } else {
+                                       
+                                       /* add a record of this crossfade, keeping an association
+                                          with the new fade-in region
+                                       */
+
+                                       crossfade_triple ct;
+
+                                       ct.old_in = on->first;
+                                       ct.new_out = on->second;
+
+                                       crossfade_info[*i] = ct;
+                               }
+                       }
+               }
+       }
+
+       for (CrossfadeInfo::iterator ci = crossfade_info.begin(); ci != crossfade_info.end(); ++ci) {
+               
+               /* for each crossfade that involves at least two of the old regions,
+                  create a new identical crossfade with the new regions
+               */
+               
+               if (!ci->second.new_in || !ci->second.new_out) {
+                       continue;
+               }
+
+               boost::shared_ptr<Crossfade> new_xfade (new Crossfade (ci->first, 
+                                                                      boost::dynamic_pointer_cast<AudioRegion>(ci->second.new_in),
+                                                                      boost::dynamic_pointer_cast<AudioRegion>(ci->second.new_out)));
+               
+               /* add it at the right position */
+
+               new_xfade->set_position (new_xfade->position() + (ci->second.new_in->position() - ci->second.old_in->position()), this);
+               cerr << "Add new xfade to new playlist @ " << new_xfade->position() << " len " << new_xfade->length()
+                    << " in = " << new_xfade->in()->name() << " out = " << new_xfade->out()->name() << endl;
+               other_audio->add_crossfade (new_xfade);
+       }
+}