Fix region-gain offset when separating ranges
[ardour.git] / libs / ardour / playlist.cc
index 0e58b4b622dfe7eda5fff483e1e0567cc0063171..39a6dc77ed01dbb2ad98e5a3267b1f468d2b0315 100644 (file)
 #include <algorithm>
 #include <string>
 
-#include <boost/lexical_cast.hpp>
-
-#include "pbd/convert.h"
+#include "pbd/types_convert.h"
 #include "pbd/stateful_diff_command.h"
+#include "pbd/strsplit.h"
 #include "pbd/xml++.h"
 
 #include "ardour/debug.h"
+#include "ardour/midi_region.h"
 #include "ardour/playlist.h"
-#include "ardour/session.h"
+#include "ardour/playlist_factory.h"
+#include "ardour/playlist_source.h"
 #include "ardour/region.h"
 #include "ardour/region_factory.h"
 #include "ardour/region_sorters.h"
-#include "ardour/playlist_factory.h"
-#include "ardour/playlist_source.h"
-#include "ardour/transient_detector.h"
+#include "ardour/session.h"
 #include "ardour/session_playlists.h"
 #include "ardour/source_factory.h"
+#include "ardour/tempo.h"
+#include "ardour/transient_detector.h"
+#include "ardour/types_convert.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -104,16 +106,16 @@ RegionListProperty::get_content_as_xml (boost::shared_ptr<Region> region, XMLNod
           code, so we can just store ID here.
        */
 
-       node.add_property ("id", region->id().to_s ());
+       node.set_property ("id", region->id());
 }
 
 boost::shared_ptr<Region>
 RegionListProperty::get_content_from_xml (XMLNode const & node) const
 {
-       XMLProperty const * prop = node.property ("id");
-       assert (prop);
-
-       PBD::ID id (prop->value ());
+       PBD::ID id;
+       if (!node.get_property ("id", id)) {
+               assert (false);
+       }
 
        boost::shared_ptr<Region> ret = _playlist.region_by_id (id);
 
@@ -141,7 +143,7 @@ Playlist::Playlist (Session& sess, const XMLNode& node, DataType type, bool hide
        , _type(type)
 {
 #ifndef NDEBUG
-       const XMLProperty* prop = node.property("type");
+       XMLProperty const * prop = node.property("type");
        assert(!prop || DataType(prop->value()) == _type);
 #endif
 
@@ -157,6 +159,7 @@ Playlist::Playlist (boost::shared_ptr<const Playlist> other, string namestr, boo
        , regions (*this)
        , _type(other->_type)
        , _orig_track_id (other->_orig_track_id)
+       , _shared_with_ids (other->_shared_with_ids)
 {
        init (hide);
 
@@ -189,6 +192,7 @@ Playlist::Playlist (boost::shared_ptr<const Playlist> other, framepos_t start, f
        , regions (*this)
        , _type(other->_type)
        , _orig_track_id (other->_orig_track_id)
+       , _shared_with_ids (other->_shared_with_ids)
 {
        RegionReadLock rlock2 (const_cast<Playlist*> (other.get()));
 
@@ -289,7 +293,7 @@ Playlist::copy_regions (RegionList& newlist) const
        RegionReadLock rlock (const_cast<Playlist *> (this));
 
        for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
-               newlist.push_back (RegionFactory::create (*i, true));
+               newlist.push_back (RegionFactory::create (*i, true, true));
        }
 }
 
@@ -358,11 +362,7 @@ Playlist::_set_sort_id ()
        } else {
                string t = _name.val().substr(dot_position + 1);
 
-               try {
-                       _sort_id = boost::lexical_cast<int>(t);
-               }
-
-               catch (boost::bad_lexical_cast e) {
+               if (!string_to_uint32 (t, _sort_id)) {
                        _sort_id = 0;
                }
        }
@@ -648,625 +648,694 @@ Playlist::flush_notifications (bool from_undo)
        in_flush = false;
 }
 
- void
- Playlist::clear_pending ()
- {
-        pending_adds.clear ();
-        pending_removes.clear ();
-        pending_bounds.clear ();
-        pending_range_moves.clear ();
-        pending_region_extensions.clear ();
-        pending_contents_change = false;
- }
+void
+Playlist::clear_pending ()
+{
+       pending_adds.clear ();
+       pending_removes.clear ();
+       pending_bounds.clear ();
+       pending_range_moves.clear ();
+       pending_region_extensions.clear ();
+       pending_contents_change = false;
+       pending_layering = false;
+}
 
- /*************************************************************
+/*************************************************************
    PLAYLIST OPERATIONS
-  *************************************************************/
+*************************************************************/
 
 /** Note: this calls set_layer (..., DBL_MAX) so it will reset the layering index of region */
- void
- Playlist::add_region (boost::shared_ptr<Region> region, framepos_t position, float times, bool auto_partition)
- {
-        RegionWriteLock rlock (this);
-        times = fabs (times);
-
-        int itimes = (int) floor (times);
+void
+Playlist::add_region (boost::shared_ptr<Region> region, framepos_t position, float times, bool auto_partition, int32_t sub_num, double quarter_note, bool for_music)
+{
+       RegionWriteLock rlock (this);
+       times = fabs (times);
 
-        framepos_t pos = position;
+       int itimes = (int) floor (times);
 
-        if (times == 1 && auto_partition){
-                partition(pos - 1, (pos + region->length()), true);
-        }
+       framepos_t pos = position;
 
-        if (itimes >= 1) {
-                add_region_internal (region, pos);
-                set_layer (region, DBL_MAX);
-                pos += region->length();
-                --itimes;
-        }
+       if (times == 1 && auto_partition){
+               RegionList thawlist;
+               partition_internal (pos - 1, (pos + region->length()), true, thawlist);
+               for (RegionList::iterator i = thawlist.begin(); i != thawlist.end(); ++i) {
+                       (*i)->resume_property_changes ();
+                       _session.add_command (new StatefulDiffCommand (*i));
+               }
+       }
 
+       if (itimes >= 1) {
+               add_region_internal (region, pos, sub_num, quarter_note, for_music);
+               set_layer (region, DBL_MAX);
+               pos += region->length();
+               --itimes;
+       }
 
-        /* note that itimes can be zero if we being asked to just
-           insert a single fraction of the region.
-        */
+       /* note that itimes can be zero if we being asked to just
+          insert a single fraction of the region.
+       */
 
-        for (int i = 0; i < itimes; ++i) {
-                boost::shared_ptr<Region> copy = RegionFactory::create (region, true);
-                add_region_internal (copy, pos);
-                set_layer (copy, DBL_MAX);
-                pos += region->length();
-        }
+       for (int i = 0; i < itimes; ++i) {
+               boost::shared_ptr<Region> copy = RegionFactory::create (region, true);
+               add_region_internal (copy, pos, sub_num);
+               set_layer (copy, DBL_MAX);
+               pos += region->length();
+       }
 
-        framecnt_t length = 0;
+       framecnt_t length = 0;
 
-        if (floor (times) != times) {
-                length = (framecnt_t) floor (region->length() * (times - floor (times)));
-                string name;
-                RegionFactory::region_name (name, region->name(), false);
+       if (floor (times) != times) {
+               length = (framecnt_t) floor (region->length() * (times - floor (times)));
+               string name;
+               RegionFactory::region_name (name, region->name(), false);
 
-                {
-                        PropertyList plist;
+               {
+                       PropertyList plist;
 
-                        plist.add (Properties::start, region->start());
-                        plist.add (Properties::length, length);
-                        plist.add (Properties::name, name);
-                        plist.add (Properties::layer, region->layer());
+                       plist.add (Properties::start, region->start());
+                       plist.add (Properties::length, length);
+                       plist.add (Properties::name, name);
+                       plist.add (Properties::layer, region->layer());
 
-                        boost::shared_ptr<Region> sub = RegionFactory::create (region, plist);
-                        add_region_internal (sub, pos);
-                        set_layer (sub, DBL_MAX);
-                }
-        }
-
-        possibly_splice_unlocked (position, (pos + length) - position, region);
- }
+                       boost::shared_ptr<Region> sub = RegionFactory::create (region, plist);
+                       add_region_internal (sub, pos, sub_num);
+                       set_layer (sub, DBL_MAX);
+               }
+       }
 
- void
- Playlist::set_region_ownership ()
- {
-        RegionWriteLock rl (this);
-        RegionList::iterator i;
-        boost::weak_ptr<Playlist> pl (shared_from_this());
+       possibly_splice_unlocked (position, (pos + length) - position, region);
+}
 
-        for (i = regions.begin(); i != regions.end(); ++i) {
-                (*i)->set_playlist (pl);
-        }
- }
+void
+Playlist::set_region_ownership ()
+{
+       RegionWriteLock rl (this);
+       RegionList::iterator i;
+       boost::weak_ptr<Playlist> pl (shared_from_this());
 
- bool
- Playlist::add_region_internal (boost::shared_ptr<Region> region, framepos_t position)
- {
-        if (region->data_type() != _type) {
-                return false;
-        }
+       for (i = regions.begin(); i != regions.end(); ++i) {
+               (*i)->set_playlist (pl);
+       }
+}
 
-        RegionSortByPosition cmp;
+bool
+Playlist::add_region_internal (boost::shared_ptr<Region> region, framepos_t position, int32_t sub_num, double quarter_note, bool for_music)
+{
+       if (region->data_type() != _type) {
+               return false;
+       }
 
-        if (!first_set_state) {
-                boost::shared_ptr<Playlist> foo (shared_from_this());
-                region->set_playlist (boost::weak_ptr<Playlist>(foo));
-        }
+       RegionSortByPosition cmp;
 
-        region->set_position (position);
+       if (!first_set_state) {
+               boost::shared_ptr<Playlist> foo (shared_from_this());
+               region->set_playlist (boost::weak_ptr<Playlist>(foo));
+       }
+       if (for_music) {
+               region->set_position_music (quarter_note);
+       } else {
+               region->set_position (position, sub_num);
+       }
 
-        regions.insert (upper_bound (regions.begin(), regions.end(), region, cmp), region);
-        all_regions.insert (region);
+       regions.insert (upper_bound (regions.begin(), regions.end(), region, cmp), region);
+       all_regions.insert (region);
 
-        possibly_splice_unlocked (position, region->length(), region);
+       possibly_splice_unlocked (position, region->length(), region);
 
-        if (!holding_state ()) {
-                /* layers get assigned from XML state, and are not reset during undo/redo */
-                relayer ();
-        }
+       if (!holding_state ()) {
+               /* layers get assigned from XML state, and are not reset during undo/redo */
+               relayer ();
+       }
 
-        /* we need to notify the existence of new region before checking dependents. Ick. */
+       /* we need to notify the existence of new region before checking dependents. Ick. */
 
-        notify_region_added (region);
+       notify_region_added (region);
 
-        region->PropertyChanged.connect_same_thread (region_state_changed_connections, boost::bind (&Playlist::region_changed_proxy, this, _1, boost::weak_ptr<Region> (region)));
+       region->PropertyChanged.connect_same_thread (region_state_changed_connections, boost::bind (&Playlist::region_changed_proxy, this, _1, boost::weak_ptr<Region> (region)));
+       region->DropReferences.connect_same_thread (region_drop_references_connections, boost::bind (&Playlist::region_going_away, this, boost::weak_ptr<Region> (region)));
 
-        return true;
- }
+       return true;
+}
 
- void
- Playlist::replace_region (boost::shared_ptr<Region> old, boost::shared_ptr<Region> newr, framepos_t pos)
- {
-        RegionWriteLock rlock (this);
+void
+Playlist::replace_region (boost::shared_ptr<Region> old, boost::shared_ptr<Region> newr, framepos_t pos)
+{
+       RegionWriteLock rlock (this);
 
-        bool old_sp = _splicing;
-        _splicing = true;
+       bool old_sp = _splicing;
+       _splicing = true;
 
-        remove_region_internal (old);
-        add_region_internal (newr, pos);
-        set_layer (newr, old->layer ());
+       remove_region_internal (old);
+       add_region_internal (newr, pos);
+       set_layer (newr, old->layer ());
 
-        _splicing = old_sp;
+       _splicing = old_sp;
 
-        possibly_splice_unlocked (pos, old->length() - newr->length());
- }
+       possibly_splice_unlocked (pos, old->length() - newr->length());
+}
 
- void
- Playlist::remove_region (boost::shared_ptr<Region> region)
- {
-        RegionWriteLock rlock (this);
-        remove_region_internal (region);
- }
+void
+Playlist::remove_region (boost::shared_ptr<Region> region)
+{
+       RegionWriteLock rlock (this);
+       remove_region_internal (region);
+}
 
- int
- Playlist::remove_region_internal (boost::shared_ptr<Region> region)
- {
-        RegionList::iterator i;
+int
+Playlist::remove_region_internal (boost::shared_ptr<Region> region)
+{
+       RegionList::iterator i;
 
-        if (!in_set_state) {
-                /* unset playlist */
-                region->set_playlist (boost::weak_ptr<Playlist>());
-        }
+       if (!in_set_state) {
+               /* unset playlist */
+               region->set_playlist (boost::weak_ptr<Playlist>());
+       }
 
-        /* XXX should probably freeze here .... */
+       /* XXX should probably freeze here .... */
 
-        for (i = regions.begin(); i != regions.end(); ++i) {
-                if (*i == region) {
+       for (i = regions.begin(); i != regions.end(); ++i) {
+               if (*i == region) {
 
-                        framepos_t pos = (*i)->position();
-                        framecnt_t distance = (*i)->length();
+                       framepos_t pos = (*i)->position();
+                       framecnt_t distance = (*i)->length();
 
-                        regions.erase (i);
+                       regions.erase (i);
 
-                        possibly_splice_unlocked (pos, -distance);
+                       possibly_splice_unlocked (pos, -distance);
 
-                        if (!holding_state ()) {
-                                relayer ();
-                                remove_dependents (region);
-                        }
+                       if (!holding_state ()) {
+                               relayer ();
+                               remove_dependents (region);
+                       }
 
-                        notify_region_removed (region);
-                        break;
-                }
-        }
+                       notify_region_removed (region);
+                       break;
+               }
+       }
 
-        return -1;
- }
+       return -1;
+}
 
- void
- Playlist::get_equivalent_regions (boost::shared_ptr<Region> other, vector<boost::shared_ptr<Region> >& results)
- {
-        if (Config->get_use_overlap_equivalency()) {
-                for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
-                        if ((*i)->overlap_equivalent (other)) {
-                                results.push_back (*i);
-                        }
-                }
-        } else {
-                for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
-                        if ((*i)->equivalent (other)) {
-                                results.push_back (*i);
-                        }
-                }
-        }
- }
+void
+Playlist::get_equivalent_regions (boost::shared_ptr<Region> other, vector<boost::shared_ptr<Region> >& results)
+{
+       if (Config->get_use_overlap_equivalency()) {
+               for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
+                       if ((*i)->overlap_equivalent (other)) {
+                               results.push_back (*i);
+                       }
+               }
+       } else {
+               for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
+                       if ((*i)->equivalent (other)) {
+                               results.push_back (*i);
+                       }
+               }
+       }
+}
 
- void
- Playlist::get_region_list_equivalent_regions (boost::shared_ptr<Region> other, vector<boost::shared_ptr<Region> >& results)
- {
-        for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
+void
+Playlist::get_region_list_equivalent_regions (boost::shared_ptr<Region> other, vector<boost::shared_ptr<Region> >& results)
+{
+       for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
 
-                if ((*i) && (*i)->region_list_equivalent (other)) {
-                        results.push_back (*i);
-                }
-        }
- }
+               if ((*i) && (*i)->region_list_equivalent (other)) {
+                       results.push_back (*i);
+               }
+       }
+}
 
- void
- Playlist::get_source_equivalent_regions (boost::shared_ptr<Region> other, vector<boost::shared_ptr<Region> >& results)
- {
-        for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
+void
+Playlist::get_source_equivalent_regions (boost::shared_ptr<Region> other, vector<boost::shared_ptr<Region> >& results)
+{
+       for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
 
-                if ((*i) && (*i)->any_source_equivalent (other)) {
-                        results.push_back (*i);
-                }
-        }
- }
+               if ((*i) && (*i)->any_source_equivalent (other)) {
+                       results.push_back (*i);
+               }
+       }
+}
 
- void
- Playlist::partition (framepos_t start, framepos_t end, bool cut)
- {
-        RegionList thawlist;
+void
+Playlist::partition (framepos_t start, framepos_t end, bool cut)
+{
+       RegionList thawlist;
+       {
+               RegionWriteLock lock(this);
+               partition_internal (start, end, cut, thawlist);
+       }
 
-        partition_internal (start, end, cut, thawlist);
+       for (RegionList::iterator i = thawlist.begin(); i != thawlist.end(); ++i) {
+               (*i)->resume_property_changes ();
+       }
+}
 
-        for (RegionList::iterator i = thawlist.begin(); i != thawlist.end(); ++i) {
-                (*i)->resume_property_changes ();
-        }
- }
+/* If a MIDI region is locked to musical-time, Properties::start is ignored
+ * and _start is overwritten using Properties::start_beats in
+ * add_region_internal() -> Region::set_position() -> MidiRegion::set_position_internal()
+ */
+static void maybe_add_start_beats (TempoMap const& tm, PropertyList& plist, boost::shared_ptr<Region> r, framepos_t start, framepos_t end)
+{
+       boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(r);
+       if (!mr) {
+               return;
+       }
+       double delta_beats = tm.quarter_notes_between_frames (start, end);
+       plist.add (Properties::start_beats, mr->start_beats () + delta_beats);
+}
 
 /** Go through each region on the playlist and cut them at start and end, removing the section between
  *  start and end if cutting == true.  Regions that lie entirely within start and end are always
  *  removed.
  */
 
- void
- Playlist::partition_internal (framepos_t start, framepos_t end, bool cutting, RegionList& thawlist)
- {
-        RegionList new_regions;
+void
+Playlist::partition_internal (framepos_t start, framepos_t end, bool cutting, RegionList& thawlist)
+{
+       RegionList new_regions;
 
-        {
-                RegionWriteLock rlock (this);
+       {
 
-                boost::shared_ptr<Region> region;
-                boost::shared_ptr<Region> current;
-                string new_name;
-                RegionList::iterator tmp;
-                Evoral::OverlapType overlap;
-                framepos_t pos1, pos2, pos3, pos4;
+               boost::shared_ptr<Region> region;
+               boost::shared_ptr<Region> current;
+               string new_name;
+               RegionList::iterator tmp;
+               Evoral::OverlapType overlap;
+               framepos_t pos1, pos2, pos3, pos4;
 
-                in_partition = true;
+               in_partition = true;
 
-                /* need to work from a copy, because otherwise the regions we add during the process
-                   get operated on as well.
-                */
+               /* need to work from a copy, because otherwise the regions we add during the process
+                  get operated on as well.
+               */
 
-                RegionList copy = regions.rlist();
+               RegionList copy = regions.rlist();
 
-                for (RegionList::iterator i = copy.begin(); i != copy.end(); i = tmp) {
+               for (RegionList::iterator i = copy.begin(); i != copy.end(); i = tmp) {
 
-                        tmp = i;
-                        ++tmp;
+                       tmp = i;
+                       ++tmp;
 
-                        current = *i;
+                       current = *i;
 
-                        if (current->first_frame() >= start && current->last_frame() < end) {
+                       if (current->first_frame() >= start && current->last_frame() < end) {
 
-                                if (cutting) {
-                                        remove_region_internal (current);
-                                }
+                               if (cutting) {
+                                       remove_region_internal (current);
+                               }
 
-                                continue;
-                        }
+                               continue;
+                       }
 
-                        /* coverage will return OverlapStart if the start coincides
-                           with the end point. we do not partition such a region,
-                           so catch this special case.
-                        */
+                       /* coverage will return OverlapStart if the start coincides
+                          with the end point. we do not partition such a region,
+                          so catch this special case.
+                       */
 
-                        if (current->first_frame() >= end) {
-                                continue;
-                        }
+                       if (current->first_frame() >= end) {
+                               continue;
+                       }
 
-                        if ((overlap = current->coverage (start, end)) == Evoral::OverlapNone) {
-                                continue;
-                        }
+                       if ((overlap = current->coverage (start, end)) == Evoral::OverlapNone) {
+                               continue;
+                       }
 
-                        pos1 = current->position();
-                        pos2 = start;
-                        pos3 = end;
-                        pos4 = current->last_frame();
-
-                        if (overlap == Evoral::OverlapInternal) {
-                                /* split: we need 3 new regions, the front, middle and end.
-                                   cut:   we need 2 regions, the front and end.
-                                */
-
-                                /*
-                                         start                 end
-                          ---------------*************************------------
-                                         P1  P2              P3  P4
-                          SPLIT:
-                          ---------------*****++++++++++++++++====------------
-                          CUT
-                          ---------------*****----------------====------------
-
-                                */
-
-                                if (!cutting) {
-                                        /* "middle" ++++++ */
-
-                                        RegionFactory::region_name (new_name, current->name(), false);
-
-                                        PropertyList plist;
-
-                                        plist.add (Properties::start, current->start() + (pos2 - pos1));
-                                        plist.add (Properties::length, pos3 - pos2);
-                                        plist.add (Properties::name, new_name);
-                                        plist.add (Properties::layer, current->layer ());
-                                        plist.add (Properties::layering_index, current->layering_index ());
-                                        plist.add (Properties::automatic, true);
-                                        plist.add (Properties::left_of_split, true);
-                                        plist.add (Properties::right_of_split, true);
-
-                                        region = RegionFactory::create (current, plist);
-                                        add_region_internal (region, start);
-                                        new_regions.push_back (region);
-                                }
+                       pos1 = current->position();
+                       pos2 = start;
+                       pos3 = end;
+                       pos4 = current->last_frame();
+
+                       if (overlap == Evoral::OverlapInternal) {
+                               /* split: we need 3 new regions, the front, middle and end.
+                                  cut:   we need 2 regions, the front and end.
+                               */
+
+                               /*
+                                 start                 end
+                                 ---------------*************************------------
+                                 P1  P2              P3  P4
+                                 SPLIT:
+                                 ---------------*****++++++++++++++++====------------
+                                 CUT
+                                 ---------------*****----------------====------------
+
+                               */
+
+                               if (!cutting) {
+                                       /* "middle" ++++++ */
+
+                                       RegionFactory::region_name (new_name, current->name(), false);
+
+                                       PropertyList plist;
+
+                                       plist.add (Properties::start, current->start() + (pos2 - pos1));
+                                       plist.add (Properties::length, pos3 - pos2);
+                                       plist.add (Properties::name, new_name);
+                                       plist.add (Properties::layer, current->layer ());
+                                       plist.add (Properties::layering_index, current->layering_index ());
+                                       plist.add (Properties::automatic, true);
+                                       plist.add (Properties::left_of_split, true);
+                                       plist.add (Properties::right_of_split, true);
+                                       maybe_add_start_beats (_session.tempo_map(), plist, current, current->start(), current->start() + (pos2 - pos1));
+
+                                       /* see note in :_split_region()
+                                        * for MusicFrame is needed to offset region-gain
+                                        */
+                                       region = RegionFactory::create (current, MusicFrame (pos2 - pos1, 0), plist);
+                                       add_region_internal (region, start);
+                                       new_regions.push_back (region);
+                               }
 
-                                /* "end" ====== */
+                               /* "end" ====== */
 
-                                RegionFactory::region_name (new_name, current->name(), false);
+                               RegionFactory::region_name (new_name, current->name(), false);
 
-                                PropertyList plist;
+                               PropertyList plist;
 
-                                plist.add (Properties::start, current->start() + (pos3 - pos1));
-                                plist.add (Properties::length, pos4 - pos3);
-                                plist.add (Properties::name, new_name);
-                                plist.add (Properties::layer, current->layer ());
-                                plist.add (Properties::layering_index, current->layering_index ());
-                                plist.add (Properties::automatic, true);
-                                plist.add (Properties::right_of_split, true);
+                               plist.add (Properties::start, current->start() + (pos3 - pos1));
+                               plist.add (Properties::length, pos4 - pos3);
+                               plist.add (Properties::name, new_name);
+                               plist.add (Properties::layer, current->layer ());
+                               plist.add (Properties::layering_index, current->layering_index ());
+                               plist.add (Properties::automatic, true);
+                               plist.add (Properties::right_of_split, true);
+                               maybe_add_start_beats (_session.tempo_map(), plist, current, current->start(), current->start() + (pos3 - pos1));
 
-                                region = RegionFactory::create (current, plist);
+                               region = RegionFactory::create (current, MusicFrame (pos3 - pos1, 0), plist);
 
-                                add_region_internal (region, end);
-                                new_regions.push_back (region);
+                               add_region_internal (region, end);
+                               new_regions.push_back (region);
 
-                                /* "front" ***** */
+                               /* "front" ***** */
 
-                                current->suspend_property_changes ();
-                                thawlist.push_back (current);
-                                current->cut_end (pos2 - 1);
+                               current->clear_changes ();
+                               current->suspend_property_changes ();
+                               thawlist.push_back (current);
+                               current->cut_end (pos2 - 1);
 
-                        } else if (overlap == Evoral::OverlapEnd) {
+                       } else if (overlap == Evoral::OverlapEnd) {
 
-                                /*
-                                                              start           end
-                                    ---------------*************************------------
-                                                   P1           P2         P4   P3
-                                    SPLIT:
-                                    ---------------**************+++++++++++------------
-                                    CUT:
-                                    ---------------**************-----------------------
-                                */
+                               /*
+                                 start           end
+                                 ---------------*************************------------
+                                 P1           P2         P4   P3
+                                 SPLIT:
+                                 ---------------**************+++++++++++------------
+                                 CUT:
+                                 ---------------**************-----------------------
+                               */
 
-                                if (!cutting) {
+                               if (!cutting) {
 
-                                        /* end +++++ */
+                                       /* end +++++ */
 
-                                        RegionFactory::region_name (new_name, current->name(), false);
+                                       RegionFactory::region_name (new_name, current->name(), false);
 
-                                        PropertyList plist;
+                                       PropertyList plist;
 
-                                        plist.add (Properties::start, current->start() + (pos2 - pos1));
-                                        plist.add (Properties::length, pos4 - pos2);
-                                        plist.add (Properties::name, new_name);
-                                        plist.add (Properties::layer, current->layer ());
-                                        plist.add (Properties::layering_index, current->layering_index ());
-                                        plist.add (Properties::automatic, true);
-                                        plist.add (Properties::left_of_split, true);
+                                       plist.add (Properties::start, current->start() + (pos2 - pos1));
+                                       plist.add (Properties::length, pos4 - pos2);
+                                       plist.add (Properties::name, new_name);
+                                       plist.add (Properties::layer, current->layer ());
+                                       plist.add (Properties::layering_index, current->layering_index ());
+                                       plist.add (Properties::automatic, true);
+                                       plist.add (Properties::left_of_split, true);
+                                       maybe_add_start_beats (_session.tempo_map(), plist, current, current->start(), current->start() + (pos2 - pos1));
 
-                                        region = RegionFactory::create (current, plist);
+                                       region = RegionFactory::create (current, MusicFrame(pos2 - pos1, 0), plist);
 
-                                        add_region_internal (region, start);
-                                        new_regions.push_back (region);
-                                }
+                                       add_region_internal (region, start);
+                                       new_regions.push_back (region);
+                               }
 
-                                /* front ****** */
+                               /* front ****** */
 
-                                current->suspend_property_changes ();
-                                thawlist.push_back (current);
-                                current->cut_end (pos2 - 1);
+                               current->clear_changes ();
+                               current->suspend_property_changes ();
+                               thawlist.push_back (current);
+                               current->cut_end (pos2 - 1);
 
-                        } else if (overlap == Evoral::OverlapStart) {
+                       } else if (overlap == Evoral::OverlapStart) {
 
-                                /* split: we need 2 regions: the front and the end.
-                                   cut: just trim current to skip the cut area
-                                */
+                               /* split: we need 2 regions: the front and the end.
+                                  cut: just trim current to skip the cut area
+                               */
 
-                                /*
-                                                        start           end
-                                    ---------------*************************------------
-                                       P2          P1 P3                   P4
+                               /*
+                                 start           end
+                                 ---------------*************************------------
+                                 P2          P1 P3                   P4
 
-                                    SPLIT:
-                                    ---------------****+++++++++++++++++++++------------
-                                    CUT:
-                                    -------------------*********************------------
+                                 SPLIT:
+                                 ---------------****+++++++++++++++++++++------------
+                                 CUT:
+                                 -------------------*********************------------
 
-                                */
+                               */
 
-                                if (!cutting) {
-                                        /* front **** */
-                                        RegionFactory::region_name (new_name, current->name(), false);
+                               if (!cutting) {
+                                       /* front **** */
+                                       RegionFactory::region_name (new_name, current->name(), false);
 
-                                        PropertyList plist;
+                                       PropertyList plist;
 
-                                        plist.add (Properties::start, current->start());
-                                        plist.add (Properties::length, pos3 - pos1);
-                                        plist.add (Properties::name, new_name);
-                                        plist.add (Properties::layer, current->layer ());
-                                        plist.add (Properties::layering_index, current->layering_index ());
-                                        plist.add (Properties::automatic, true);
-                                        plist.add (Properties::right_of_split, true);
+                                       plist.add (Properties::start, current->start());
+                                       plist.add (Properties::length, pos3 - pos1);
+                                       plist.add (Properties::name, new_name);
+                                       plist.add (Properties::layer, current->layer ());
+                                       plist.add (Properties::layering_index, current->layering_index ());
+                                       plist.add (Properties::automatic, true);
+                                       plist.add (Properties::right_of_split, true);
+                                       maybe_add_start_beats (_session.tempo_map(), plist, current, current->start(), current->start());
 
-                                        region = RegionFactory::create (current, plist);
+                                       region = RegionFactory::create (current, plist);
 
-                                        add_region_internal (region, pos1);
-                                        new_regions.push_back (region);
-                                }
+                                       add_region_internal (region, pos1);
+                                       new_regions.push_back (region);
+                               }
 
-                                /* end */
+                               /* end */
 
-                                current->suspend_property_changes ();
-                                thawlist.push_back (current);
-                                current->trim_front (pos3);
-                        } else if (overlap == Evoral::OverlapExternal) {
+                               current->clear_changes ();
+                               current->suspend_property_changes ();
+                               thawlist.push_back (current);
+                               current->trim_front (pos3);
+                       } else if (overlap == Evoral::OverlapExternal) {
 
-                                /* split: no split required.
-                                   cut: remove the region.
-                                */
+                               /* split: no split required.
+                                  cut: remove the region.
+                               */
 
-                                /*
-                                       start                                      end
-                                    ---------------*************************------------
-                                       P2          P1 P3                   P4
+                               /*
+                                 start                                      end
+                                 ---------------*************************------------
+                                 P2          P1 P3                   P4
 
-                                    SPLIT:
-                                    ---------------*************************------------
-                                    CUT:
-                                    ----------------------------------------------------
+                                 SPLIT:
+                                 ---------------*************************------------
+                                 CUT:
+                                 ----------------------------------------------------
 
-                                */
+                               */
 
-                                if (cutting) {
-                                        remove_region_internal (current);
-                                }
+                               if (cutting) {
+                                       remove_region_internal (current);
+                               }
 
-                                new_regions.push_back (current);
-                        }
-                }
+                               new_regions.push_back (current);
+                       }
+               }
 
-                in_partition = false;
-        }
+               in_partition = false;
+       }
 
        //keep track of any dead space at end (for pasting into Ripple or Splice mode)
        framepos_t wanted_length = end-start;
-       _end_space = wanted_length - get_extent().second-get_extent().first;
- }
+       _end_space = wanted_length - _get_extent().second - _get_extent().first;
+}
 
- boost::shared_ptr<Playlist>
- Playlist::cut_copy (boost::shared_ptr<Playlist> (Playlist::*pmf)(framepos_t, framecnt_t,bool), list<AudioRange>& ranges, bool result_is_hidden)
- {
-        boost::shared_ptr<Playlist> ret;
-        boost::shared_ptr<Playlist> pl;
-        framepos_t start;
+boost::shared_ptr<Playlist>
+Playlist::cut_copy (boost::shared_ptr<Playlist> (Playlist::*pmf)(framepos_t, framecnt_t,bool), list<AudioRange>& ranges, bool result_is_hidden)
+{
+       boost::shared_ptr<Playlist> ret;
+       boost::shared_ptr<Playlist> pl;
+       framepos_t start;
 
-        if (ranges.empty()) {
-                return boost::shared_ptr<Playlist>();
-        }
+       if (ranges.empty()) {
+               return boost::shared_ptr<Playlist>();
+       }
 
-        start = ranges.front().start;
+       start = ranges.front().start;
 
-        for (list<AudioRange>::iterator i = ranges.begin(); i != ranges.end(); ++i) {
+       for (list<AudioRange>::iterator i = ranges.begin(); i != ranges.end(); ++i) {
 
-                pl = (this->*pmf)((*i).start, (*i).length(), result_is_hidden);
+               pl = (this->*pmf)((*i).start, (*i).length(), result_is_hidden);
 
-                if (i == ranges.begin()) {
-                        ret = pl;
-                } else {
+               if (i == ranges.begin()) {
+                       ret = pl;
+               } else {
 
-                        /* paste the next section into the nascent playlist,
-                           offset to reflect the start of the first range we
-                           chopped.
-                        */
+                       /* paste the next section into the nascent playlist,
+                          offset to reflect the start of the first range we
+                          chopped.
+                       */
 
-                        ret->paste (pl, (*i).start - start, 1.0f);
-                }
-        }
+                       ret->paste (pl, (*i).start - start, 1.0f, 0);
+               }
+       }
 
-        return ret;
- }
+       return ret;
+}
 
- boost::shared_ptr<Playlist>
- Playlist::cut (list<AudioRange>& ranges, bool result_is_hidden)
- {
-        boost::shared_ptr<Playlist> (Playlist::*pmf)(framepos_t,framecnt_t,bool) = &Playlist::cut;
-        return cut_copy (pmf, ranges, result_is_hidden);
- }
+boost::shared_ptr<Playlist>
+Playlist::cut (list<AudioRange>& ranges, bool result_is_hidden)
+{
+       boost::shared_ptr<Playlist> (Playlist::*pmf)(framepos_t,framecnt_t,bool) = &Playlist::cut;
+       return cut_copy (pmf, ranges, result_is_hidden);
+}
 
- boost::shared_ptr<Playlist>
- Playlist::copy (list<AudioRange>& ranges, bool result_is_hidden)
- {
-        boost::shared_ptr<Playlist> (Playlist::*pmf)(framepos_t,framecnt_t,bool) = &Playlist::copy;
-        return cut_copy (pmf, ranges, result_is_hidden);
- }
+boost::shared_ptr<Playlist>
+Playlist::copy (list<AudioRange>& ranges, bool result_is_hidden)
+{
+       boost::shared_ptr<Playlist> (Playlist::*pmf)(framepos_t,framecnt_t,bool) = &Playlist::copy;
+       return cut_copy (pmf, ranges, result_is_hidden);
+}
 
- boost::shared_ptr<Playlist>
- Playlist::cut (framepos_t start, framecnt_t cnt, bool result_is_hidden)
- {
-        boost::shared_ptr<Playlist> the_copy;
-        RegionList thawlist;
-        char buf[32];
+boost::shared_ptr<Playlist>
+Playlist::cut (framepos_t start, framecnt_t cnt, bool result_is_hidden)
+{
+       boost::shared_ptr<Playlist> the_copy;
+       RegionList thawlist;
+       char buf[32];
 
-        snprintf (buf, sizeof (buf), "%" PRIu32, ++subcnt);
-        string new_name = _name;
-        new_name += '.';
-        new_name += buf;
+       snprintf (buf, sizeof (buf), "%" PRIu32, ++subcnt);
+       string new_name = _name;
+       new_name += '.';
+       new_name += buf;
 
-        if ((the_copy = PlaylistFactory::create (shared_from_this(), start, cnt, new_name, result_is_hidden)) == 0) {
-                return boost::shared_ptr<Playlist>();
-        }
+       if ((the_copy = PlaylistFactory::create (shared_from_this(), start, cnt, new_name, result_is_hidden)) == 0) {
+               return boost::shared_ptr<Playlist>();
+       }
 
-        partition_internal (start, start+cnt-1, true, thawlist);
+       {
+               RegionWriteLock rlock (this);
+               partition_internal (start, start+cnt-1, true, thawlist);
+       }
 
-        for (RegionList::iterator i = thawlist.begin(); i != thawlist.end(); ++i) {
-                (*i)->resume_property_changes();
-        }
+       for (RegionList::iterator i = thawlist.begin(); i != thawlist.end(); ++i) {
+               (*i)->resume_property_changes();
+       }
 
-        return the_copy;
- }
+       return the_copy;
+}
 
- boost::shared_ptr<Playlist>
- Playlist::copy (framepos_t start, framecnt_t cnt, bool result_is_hidden)
- {
-        char buf[32];
+boost::shared_ptr<Playlist>
+Playlist::copy (framepos_t start, framecnt_t cnt, bool result_is_hidden)
+{
+       char buf[32];
 
-        snprintf (buf, sizeof (buf), "%" PRIu32, ++subcnt);
-        string new_name = _name;
-        new_name += '.';
-        new_name += buf;
+       snprintf (buf, sizeof (buf), "%" PRIu32, ++subcnt);
+       string new_name = _name;
+       new_name += '.';
+       new_name += buf;
 
        // cnt = min (_get_extent().second - start, cnt);  (We need the full range length when copy/pasting in Ripple.  Why was this limit here?  It's not in CUT... )
 
-        return PlaylistFactory::create (shared_from_this(), start, cnt, new_name, result_is_hidden);
- }
+       return PlaylistFactory::create (shared_from_this(), start, cnt, new_name, result_is_hidden);
+}
 
- int
- Playlist::paste (boost::shared_ptr<Playlist> other, framepos_t position, float times)
- {
-        times = fabs (times);
+int
+Playlist::paste (boost::shared_ptr<Playlist> other, framepos_t position, float times, const int32_t sub_num)
+{
+       times = fabs (times);
 
-        {
-                RegionReadLock rl2 (other.get());
+       {
+               RegionReadLock rl2 (other.get());
 
-                int itimes = (int) floor (times);
-                framepos_t pos = position;
-                framecnt_t const shift = other->_get_extent().second;
-                layer_t top = top_layer ();
+               int itimes = (int) floor (times);
+               framepos_t pos = position;
+               framecnt_t const shift = other->_get_extent().second;
+               layer_t top = top_layer ();
 
-                {
-                        RegionWriteLock rl1 (this);
-                        while (itimes--) {
-                                for (RegionList::iterator i = other->regions.begin(); i != other->regions.end(); ++i) {
-                                        boost::shared_ptr<Region> copy_of_region = RegionFactory::create (*i, true);
+               {
+                       RegionWriteLock rl1 (this);
+                       while (itimes--) {
+                               for (RegionList::iterator i = other->regions.begin(); i != other->regions.end(); ++i) {
+                                       boost::shared_ptr<Region> copy_of_region = RegionFactory::create (*i, true);
 
-                                        /* put these new regions on top of all existing ones, but preserve
-                                           the ordering they had in the original playlist.
-                                        */
+                                       /* put these new regions on top of all existing ones, but preserve
+                                          the ordering they had in the original playlist.
+                                       */
 
-                                        add_region_internal (copy_of_region, (*i)->position() + pos);
-                                        set_layer (copy_of_region, copy_of_region->layer() + top);
-                                }
-                                pos += shift;
-                        }
-                }
-        }
+                                       add_region_internal (copy_of_region, (*i)->position() + pos, sub_num);
+                                       set_layer (copy_of_region, copy_of_region->layer() + top);
+                               }
+                               pos += shift;
+                       }
+               }
+       }
 
-        return 0;
- }
+       return 0;
+}
 
 
- void
- Playlist::duplicate (boost::shared_ptr<Region> region, framepos_t position, float times)
- {
-        duplicate(region, position, region->length(), times);
- }
+void
+Playlist::duplicate (boost::shared_ptr<Region> region, framepos_t position, float times)
+{
+       duplicate(region, position, region->length(), times);
+}
 
 /** @param gap from the beginning of the region to the next beginning */
- void
- Playlist::duplicate (boost::shared_ptr<Region> region, framepos_t position, framecnt_t gap, float times)
- {
-        times = fabs (times);
+void
+Playlist::duplicate (boost::shared_ptr<Region> region, framepos_t position, framecnt_t gap, float times)
+{
+       times = fabs (times);
+
+       RegionWriteLock rl (this);
+       int itimes = (int) floor (times);
+
+       while (itimes--) {
+               boost::shared_ptr<Region> copy = RegionFactory::create (region, true);
+               add_region_internal (copy, position);
+               set_layer (copy, DBL_MAX);
+               position += gap;
+       }
+
+       if (floor (times) != times) {
+               framecnt_t length = (framecnt_t) floor (region->length() * (times - floor (times)));
+               string name;
+               RegionFactory::region_name (name, region->name(), false);
+
+               {
+                       PropertyList plist;
 
+                       plist.add (Properties::start, region->start());
+                       plist.add (Properties::length, length);
+                       plist.add (Properties::name, name);
+
+                       boost::shared_ptr<Region> sub = RegionFactory::create (region, plist);
+                       add_region_internal (sub, position);
+                       set_layer (sub, DBL_MAX);
+               }
+       }
+}
+
+/** @param gap from the beginning of the region to the next beginning */
+/** @param end the first frame that does _not_ contain a duplicated frame */
+void
+Playlist::duplicate_until (boost::shared_ptr<Region> region, framepos_t position, framecnt_t gap, framepos_t end)
+{
         RegionWriteLock rl (this);
-        int itimes = (int) floor (times);
-        framepos_t pos = position + 1;
 
-        while (itimes--) {
+        while (position + region->length() - 1 < end) {
                 boost::shared_ptr<Region> copy = RegionFactory::create (region, true);
-                add_region_internal (copy, pos);
+                add_region_internal (copy, position);
                 set_layer (copy, DBL_MAX);
-                pos += gap;
+                position += gap;
         }
 
-        if (floor (times) != times) {
-                framecnt_t length = (framecnt_t) floor (region->length() * (times - floor (times)));
+        if (position < end) {
+                framecnt_t length = min (region->length(), end - position);
                 string name;
                 RegionFactory::region_name (name, region->name(), false);
 
@@ -1278,11 +1347,49 @@ Playlist::flush_notifications (bool from_undo)
                         plist.add (Properties::name, name);
 
                         boost::shared_ptr<Region> sub = RegionFactory::create (region, plist);
-                        add_region_internal (sub, pos);
+                        add_region_internal (sub, position);
                         set_layer (sub, DBL_MAX);
                 }
         }
- }
+}
+
+void
+Playlist::duplicate_range (AudioRange& range, float times)
+{
+       boost::shared_ptr<Playlist> pl = copy (range.start, range.length(), true);
+       framecnt_t offset = range.end - range.start;
+       paste (pl, range.start + offset, times, 0);
+}
+
+void
+Playlist::duplicate_ranges (std::list<AudioRange>& ranges, float times)
+{
+       if (ranges.empty()) {
+               return;
+       }
+
+       framepos_t min_pos = max_framepos;
+       framepos_t max_pos = 0;
+
+       for (std::list<AudioRange>::const_iterator i = ranges.begin();
+            i != ranges.end();
+            ++i) {
+               min_pos = min (min_pos, (*i).start);
+               max_pos = max (max_pos, (*i).end);
+       }
+
+       framecnt_t offset = max_pos - min_pos;
+
+       int count = 1;
+       int itimes = (int) floor (times);
+       while (itimes--) {
+               for (list<AudioRange>::iterator i = ranges.begin (); i != ranges.end (); ++i) {
+                       boost::shared_ptr<Playlist> pl = copy ((*i).start, (*i).length (), true);
+                       paste (pl, (*i).start + (offset * count), 1.0f, 0);
+               }
+               ++count;
+       }
+}
 
  void
  Playlist::shift (framepos_t at, frameoffset_t distance, bool move_intersected, bool ignore_music_glue)
@@ -1319,12 +1426,12 @@ Playlist::flush_notifications (bool from_undo)
 
         /* XXX: may not be necessary; Region::post_set should do this, I think */
         for (RegionList::iterator r = fixup.begin(); r != fixup.end(); ++r) {
-                (*r)->recompute_position_from_lock_style ();
+                (*r)->recompute_position_from_lock_style (0);
         }
  }
 
  void
- Playlist::split (framepos_t at)
+ Playlist::split (const MusicFrame& at)
  {
         RegionWriteLock rlock (this);
         RegionList copy (regions.rlist());
@@ -1338,28 +1445,29 @@ Playlist::flush_notifications (bool from_undo)
  }
 
  void
- Playlist::split_region (boost::shared_ptr<Region> region, framepos_t playlist_position)
+ Playlist::split_region (boost::shared_ptr<Region> region, const MusicFrame& playlist_position)
  {
         RegionWriteLock rl (this);
         _split_region (region, playlist_position);
  }
 
  void
- Playlist::_split_region (boost::shared_ptr<Region> region, framepos_t playlist_position)
+ Playlist::_split_region (boost::shared_ptr<Region> region, const MusicFrame& playlist_position)
  {
-        if (!region->covers (playlist_position)) {
+        if (!region->covers (playlist_position.frame)) {
                 return;
         }
 
-        if (region->position() == playlist_position ||
-            region->last_frame() == playlist_position) {
+        if (region->position() == playlist_position.frame ||
+            region->last_frame() == playlist_position.frame) {
                 return;
         }
 
         boost::shared_ptr<Region> left;
         boost::shared_ptr<Region> right;
-        frameoffset_t before;
-        frameoffset_t after;
+
+        MusicFrame before (playlist_position.frame - region->position(), playlist_position.division);
+        MusicFrame after (region->length() - before.frame, 0);
         string before_name;
         string after_name;
 
@@ -1368,16 +1476,12 @@ Playlist::flush_notifications (bool from_undo)
         bool old_sp = _splicing;
         _splicing = true;
 
-        before = playlist_position - region->position();
-        after = region->length() - before;
-
         RegionFactory::region_name (before_name, region->name(), false);
 
         {
                 PropertyList plist;
 
-                plist.add (Properties::position, region->position ());
-                plist.add (Properties::length, before);
+                plist.add (Properties::length, before.frame);
                 plist.add (Properties::name, before_name);
                 plist.add (Properties::left_of_split, true);
                 plist.add (Properties::layering_index, region->layering_index ());
@@ -1387,7 +1491,7 @@ Playlist::flush_notifications (bool from_undo)
                    since it supplies that offset to the Region constructor, which
                    is necessary to get audio region gain envelopes right.
                 */
-                left = RegionFactory::create (region, 0, plist);
+                left = RegionFactory::create (region, MusicFrame (0, 0), plist, true);
         }
 
         RegionFactory::region_name (after_name, region->name(), false);
@@ -1395,19 +1499,19 @@ Playlist::flush_notifications (bool from_undo)
         {
                 PropertyList plist;
 
-                plist.add (Properties::position, region->position() + before);
-                plist.add (Properties::length, after);
+                plist.add (Properties::length, after.frame);
                 plist.add (Properties::name, after_name);
                 plist.add (Properties::right_of_split, true);
                 plist.add (Properties::layering_index, region->layering_index ());
                 plist.add (Properties::layer, region->layer ());
 
                 /* same note as above */
-                right = RegionFactory::create (region, before, plist);
+                right = RegionFactory::create (region, before, plist, true);
         }
 
-        add_region_internal (left, region->position());
-        add_region_internal (right, region->position() + before);
+        add_region_internal (left, region->position(), 0);
+        add_region_internal (right, region->position() + before.frame, before.division);
+
         remove_region_internal (region);
 
         _splicing = old_sp;
@@ -1681,6 +1785,7 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar
                 RegionWriteLock rl (this);
 
                 region_state_changed_connections.drop_connections ();
+                region_drop_references_connections.drop_connections ();
 
                 for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
                         pending_removes.insert (*i);
@@ -1706,10 +1811,28 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar
 
  }
 
- /***********************************************************************
+ /* *********************************************************************
   FINDING THINGS
   **********************************************************************/
 
+boost::shared_ptr<RegionList>
+Playlist::region_list()
+{
+       RegionReadLock rlock (this);
+       boost::shared_ptr<RegionList> rlist (new RegionList (regions.rlist ()));
+       return rlist;
+}
+
+void
+Playlist::deep_sources (std::set<boost::shared_ptr<Source> >& sources) const
+{
+       RegionReadLock rlock (const_cast<Playlist*>(this));
+
+       for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
+               (*i)->deep_sources (sources);
+       }
+}
+
 boost::shared_ptr<RegionList>
 Playlist::regions_at (framepos_t frame)
 {
@@ -1759,6 +1882,7 @@ Playlist::regions_at (framepos_t frame)
         for (RegionList::iterator i = rlist->begin(); i != rlist->end(); ) {
 
                 RegionList::iterator tmp = i;
+
                 ++tmp;
 
                 if ((*i)->muted()) {
@@ -1886,7 +2010,7 @@ Playlist::find_next_transient (framepos_t from, int dir)
        bool reached = false;
 
        if (dir > 0) {
-               for (AnalysisFeatureList::iterator x = points.begin(); x != points.end(); ++x) {
+               for (AnalysisFeatureList::const_iterator x = points.begin(); x != points.end(); ++x) {
                        if ((*x) >= from) {
                                reached = true;
                        }
@@ -1984,23 +2108,25 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
 
                         boost::shared_ptr<Region> r = (*i);
                         frameoffset_t distance;
+                        const framepos_t first_frame = r->first_frame();
+                        const framepos_t last_frame = r->last_frame();
 
-                        if (r->first_frame() > frame) {
+                        if (first_frame > frame) {
 
-                                distance = r->first_frame() - frame;
+                                distance = first_frame - frame;
 
                                 if (distance < closest) {
-                                        ret = r->first_frame();
+                                        ret = first_frame;
                                         closest = distance;
                                 }
                         }
 
-                        if (r->last_frame () > frame) {
+                        if (last_frame > frame) {
 
-                                distance = r->last_frame () - frame;
+                                distance = last_frame - frame;
 
                                 if (distance < closest) {
-                                        ret = r->last_frame ();
+                                        ret = last_frame;
                                         closest = distance;
                                 }
                         }
@@ -2012,23 +2138,25 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
 
                         boost::shared_ptr<Region> r = (*i);
                         frameoffset_t distance;
+                        const framepos_t first_frame = r->first_frame();
+                        const framepos_t last_frame = r->last_frame();
 
-                        if (r->last_frame() < frame) {
+                        if (last_frame < frame) {
 
-                                distance = frame - r->last_frame();
+                                distance = frame - last_frame;
 
                                 if (distance < closest) {
-                                        ret = r->last_frame();
+                                        ret = last_frame;
                                         closest = distance;
                                 }
                         }
 
-                        if (r->first_frame() < frame) {
+                        if (first_frame < frame) {
 
-                                distance = frame - r->first_frame();
+                                distance = frame - first_frame;
 
                                 if (distance < closest) {
-                                        ret = r->first_frame();
+                                        ret = first_frame;
                                         closest = distance;
                                 }
                         }
@@ -2091,9 +2219,7 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
         XMLNode *child;
         XMLNodeList nlist;
         XMLNodeConstIterator niter;
-        XMLPropertyList plist;
         XMLPropertyConstIterator piter;
-        XMLProperty *prop;
         boost::shared_ptr<Region> region;
         string region_name;
         bool seen_region_nodes = false;
@@ -2108,26 +2234,31 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
 
         freeze ();
 
-        plist = node.properties();
-
         set_id (node);
 
-        for (piter = plist.begin(); piter != plist.end(); ++piter) {
-
-                prop = *piter;
-
-                if (prop->name() == X_("name")) {
-                        _name = prop->value();
-                        _set_sort_id ();
-                } else if (prop->name() == X_("orig-diskstream-id")) {
-                        /* XXX legacy session: fix up later */
-                        _orig_track_id = prop->value ();
-                } else if (prop->name() == X_("orig-track-id")) {
-                        _orig_track_id = prop->value ();
-                } else if (prop->name() == X_("frozen")) {
-                        _frozen = string_is_affirmative (prop->value());
-                } else if (prop->name() == X_("combine-ops")) {
-                        _combine_ops = atoi (prop->value());
+        std::string name;
+        if (node.get_property (X_("name"), name)) {
+                _name = name;
+                _set_sort_id ();
+        }
+
+        /* XXX legacy session: fix up later */
+        node.get_property (X_("orig-diskstream-id"), _orig_track_id);
+
+        node.get_property (X_("orig-track-id"), _orig_track_id);
+        node.get_property (X_("frozen"), _frozen);
+
+        node.get_property (X_("combine-ops"), _combine_ops);
+
+        string shared_ids;
+        if (node.get_property (X_("shared-with-ids"), shared_ids)) {
+                if (!shared_ids.empty()) {
+                       vector<string> result;
+                       ::split (shared_ids, result, ',');
+                       vector<string>::iterator it = result.begin();
+                       for (; it != result.end(); ++it) {
+                               _shared_with_ids.push_back (PBD::ID(*it));
+                       }
                 }
         }
 
@@ -2143,13 +2274,12 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
 
                         seen_region_nodes = true;
 
-                        if ((prop = child->property ("id")) == 0) {
+                        ID id;
+                        if (!child->get_property ("id", id)) {
                                 error << _("region state node has no ID, ignored") << endmsg;
                                 continue;
                         }
 
-                        ID id = prop->value ();
-
                         if ((region = region_by_id (id))) {
 
                                 region->suspend_property_changes ();
@@ -2207,21 +2337,28 @@ XMLNode&
 Playlist::state (bool full_state)
 {
        XMLNode *node = new XMLNode (X_("Playlist"));
-       char buf[64];
 
-       node->add_property (X_("id"), id().to_s());
-       node->add_property (X_("name"), _name);
-       node->add_property (X_("type"), _type.to_string());
+       node->set_property (X_("id"), id());
+       node->set_property (X_("name"), name());
+       node->set_property (X_("type"), _type);
+       node->set_property (X_("orig-track-id"), _orig_track_id);
+
+       string shared_ids;
+       list<PBD::ID>::const_iterator it = _shared_with_ids.begin();
+       for (; it != _shared_with_ids.end(); ++it) {
+               shared_ids += "," + (*it).to_s();
+       }
+       if (!shared_ids.empty()) {
+               shared_ids.erase(0,1);
+       }
 
-       _orig_track_id.print (buf, sizeof (buf));
-       node->add_property (X_("orig-track-id"), buf);
-       node->add_property (X_("frozen"), _frozen ? "yes" : "no");
+       node->set_property (X_("shared-with-ids"), shared_ids);
+       node->set_property (X_("frozen"), _frozen);
 
        if (full_state) {
                RegionReadLock rlock (this);
 
-               snprintf (buf, sizeof (buf), "%u", _combine_ops);
-               node->add_property ("combine-ops", buf);
+               node->set_property ("combine-ops", _combine_ops);
 
                for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
                        node->add_child_nocopy ((*i)->get_state());
@@ -2584,12 +2721,18 @@ Playlist::nudge_after (framepos_t start, framecnt_t distance, bool forwards)
 }
 
 bool
-Playlist::uses_source (boost::shared_ptr<const Source> src) const
+Playlist::uses_source (boost::shared_ptr<const Source> src, bool shallow) const
 {
        RegionReadLock rlock (const_cast<Playlist*> (this));
 
        for (set<boost::shared_ptr<Region> >::const_iterator r = all_regions.begin(); r != all_regions.end(); ++r) {
-               if ((*r)->uses_source (src)) {
+               /* Note: passing the second argument as false can cause at best
+                  incredibly deep and time-consuming recursion, and at worst
+                  cycles if the user has managed to create cycles of reference
+                  between compound regions. We generally only this during
+                  cleanup, and @param shallow is passed as true.
+               */
+               if ((*r)->uses_source (src, shallow)) {
                        return true;
                }
        }
@@ -2597,6 +2740,7 @@ Playlist::uses_source (boost::shared_ptr<const Source> src) const
        return false;
 }
 
+
 boost::shared_ptr<Region>
 Playlist::find_region (const ID& id) const
 {
@@ -2834,7 +2978,7 @@ Playlist::update_after_tempo_map_change ()
        for (RegionList::iterator i = copy.begin(); i != copy.end(); ++i) {
                (*i)->update_after_tempo_map_change ();
        }
-
+       /* possibly causes a contents changed notification (flush_notifications()) */
        thaw ();
 }
 
@@ -2860,25 +3004,6 @@ Playlist::has_region_at (framepos_t const p) const
        return (i != regions.end());
 }
 
-/** Remove any region that uses a given source */
-void
-Playlist::remove_region_by_source (boost::shared_ptr<Source> s)
-{
-       RegionWriteLock rl (this);
-
-       RegionList::iterator i = regions.begin();
-       while (i != regions.end()) {
-               RegionList::iterator j = i;
-               ++j;
-
-               if ((*i)->uses_source (s)) {
-                       remove_region_internal (*i);
-               }
-
-               i = j;
-       }
-}
-
 /** Look from a session frame time and find the start time of the next region
  *  which is on the top layer of this playlist.
  *  @param t Time to look from.
@@ -3063,7 +3188,7 @@ Playlist::uncombine (boost::shared_ptr<Region> target)
 
        // (2) get all the original regions
 
-       const RegionList& rl (pl->region_list().rlist());
+       const RegionList& rl (pl->region_list_property().rlist());
        RegionFactory::CompoundAssociations& cassocs (RegionFactory::compound_associations());
        frameoffset_t move_offset = 0;
 
@@ -3110,7 +3235,7 @@ Playlist::uncombine (boost::shared_ptr<Region> target)
                }
 
                /* check to see how the original region (in the
-                * playlist before compounding occured) overlaps
+                * playlist before compounding occurred) overlaps
                 * with the new state of the compound region.
                 */
 
@@ -3200,11 +3325,18 @@ Playlist::uncombine (boost::shared_ptr<Region> target)
 void
 Playlist::fade_range (list<AudioRange>& ranges)
 {
-        for (list<AudioRange>::iterator r = ranges.begin(); r != ranges.end(); ++r) {
-                for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
-                        (*i)->fade_range ((*r).start, (*r).end);
-                }
-        }
+       RegionReadLock rlock (this);
+       for (list<AudioRange>::iterator r = ranges.begin(); r != ranges.end(); ) {
+               list<AudioRange>::iterator tmpr = r;
+               ++tmpr;
+               for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ) {
+                       RegionList::const_iterator tmpi = i;
+                       ++tmpi;
+                       (*i)->fade_range ((*r).start, (*r).end);
+                       i = tmpi;
+               }
+               r = tmpr;
+       }
 }
 
 uint32_t
@@ -3223,9 +3355,56 @@ Playlist::max_source_level () const
 void
 Playlist::set_orig_track_id (const PBD::ID& id)
 {
+       if (shared_with(id)) {
+               // Swap 'shared_id' / origin_track_id
+               unshare_with (id);
+               share_with (_orig_track_id);
+       }
        _orig_track_id = id;
 }
 
+void
+Playlist::share_with (const PBD::ID& id)
+{
+       if (!shared_with(id)) {
+               _shared_with_ids.push_back (id);
+       }
+}
+
+void
+Playlist::unshare_with (const PBD::ID& id)
+{
+       list<PBD::ID>::iterator it = _shared_with_ids.begin ();
+       while (it != _shared_with_ids.end()) {
+               if (*it == id) {
+                       _shared_with_ids.erase (it);
+                       break;
+               }
+               ++it;
+       }
+}
+
+bool
+Playlist::shared_with (const PBD::ID& id) const
+{
+       bool shared = false;
+       list<PBD::ID>::const_iterator it = _shared_with_ids.begin ();
+       while (it != _shared_with_ids.end() && !shared) {
+               if (*it == id) {
+                       shared = true;
+               }
+               ++it;
+       }
+
+       return shared;
+}
+
+void
+Playlist::reset_shares ()
+{
+       _shared_with_ids.clear();
+}
+
 /** Take a list of ranges, coalesce any that can be coalesced, then call
  *  check_crossfades for each one.
  */