change the implementation of lower_region_to_bottom() and raise_region_to_top() to...
[ardour.git] / libs / ardour / playlist.cc
index e83a29048fadde16c32f30ffb5f99a665ab13e49..b8dc905e84e170ac5e601c7a026873a39d589b3e 100644 (file)
 #include <pbd/failed_constructor.h>
 #include <pbd/stl_delete.h>
 #include <pbd/xml++.h>
+#include <pbd/stacktrace.h>
 
 #include <ardour/playlist.h>
 #include <ardour/session.h>
 #include <ardour/region.h>
 #include <ardour/region_factory.h>
 #include <ardour/playlist_factory.h>
+#include <ardour/transient_detector.h>
+
+#include <boost/lexical_cast.hpp>
 
 #include "i18n.h"
 
@@ -76,7 +80,7 @@ Playlist::Playlist (Session& sess, string nom, bool hide)
        init (hide);
        first_set_state = false;
        _name = nom;
-       
+       _set_sort_id();
 }
 
 Playlist::Playlist (Session& sess, const XMLNode& node, bool hide)
@@ -84,6 +88,7 @@ Playlist::Playlist (Session& sess, const XMLNode& node, bool hide)
 {
        init (hide);
        _name = "unnamed"; /* reset by set_state */
+       _set_sort_id();
 
        /* set state called by derived class */
 }
@@ -227,6 +232,7 @@ Playlist::init (bool hide)
        _refcnt = 0;
        _hidden = hide;
        _splicing = false;
+       _shuffling = false;
        _nudging = false;
        in_set_state = 0;
        _edit_mode = Config->get_edit_mode();
@@ -266,6 +272,35 @@ Playlist::~Playlist ()
        /* GoingAway must be emitted by derived classes */
 }
 
+void
+Playlist::_set_sort_id ()
+{
+    /* 
+        Playlists are given names like <track name>.<id> 
+        or <track name>.<edit group name>.<id> where id 
+        is an integer. We extract the id and sort by that.
+    */
+
+    size_t dot_position = _name.find_last_of(".");
+    if (dot_position == string::npos)
+    {
+        _sort_id = 0;
+    }
+    else
+    {
+        string t = _name.substr(dot_position + 1);
+        
+        try
+        {
+            _sort_id = boost::lexical_cast<int>(t);
+        }
+        catch (boost::bad_lexical_cast e)
+        {
+            _sort_id = 0;
+        }
+    }
+}    
+
 void
 Playlist::set_name (string str)
 {
@@ -279,7 +314,19 @@ Playlist::set_name (string str)
                return;
        }
 
-       _name = str; 
+       if (str == _name) {
+               return;
+       }
+
+       string name = str;
+
+       while (_session.playlist_by_name(name) != 0) {
+               name = bump_name_once(name);
+       }
+
+       _name = name; 
+       _set_sort_id();
+       
        NameChanged(); /* EMIT SIGNAL */
 }
 
@@ -321,7 +368,6 @@ Playlist::release_notifications ()
        } 
 }
 
-
 void
 Playlist::notify_modified ()
 {
@@ -426,7 +472,6 @@ Playlist::flush_notifications ()
 
        if (n || pending_modified) {
                if (!in_set_state) {
-                       possibly_splice ();
                        relayer ();
                }
                pending_modified = false;
@@ -465,12 +510,7 @@ Playlist::add_region (boost::shared_ptr<Region> region, nframes_t position, floa
                --itimes;
        }
 
-       /* later regions will all be spliced anyway */
        
-       if (!holding_state ()) {
-               possibly_splice_unlocked ();
-       }
-
        /* note that itimes can be zero if we being asked to just
           insert a single fraction of the region.
        */
@@ -481,13 +521,18 @@ Playlist::add_region (boost::shared_ptr<Region> region, nframes_t position, floa
                pos += region->length();
        }
        
+       nframes_t length = 0;
+
        if (floor (times) != times) {
-               nframes_t length = (nframes_t) floor (region->length() * (times - floor (times)));
+               length = (nframes_t) floor (region->length() * (times - floor (times)));
                string name;
                _session.region_name (name, region->name(), false);
                boost::shared_ptr<Region> sub = RegionFactory::create (region, 0, length, name, region->layer(), region->flags());
                add_region_internal (sub, pos);
        }
+
+
+       possibly_splice_unlocked (position, (pos + length) - position, boost::shared_ptr<Region>());
 }
 
 void
@@ -524,6 +569,8 @@ Playlist::add_region_internal (boost::shared_ptr<Region> region, nframes_t posit
        regions.insert (upper_bound (regions.begin(), regions.end(), region, cmp), region);
        all_regions.insert (region);
 
+       possibly_splice_unlocked (position, region->length(), region);
+
        if (!holding_state () && !in_set_state) {
                /* layers get assigned from XML state */
                relayer ();
@@ -549,12 +596,15 @@ Playlist::replace_region (boost::shared_ptr<Region> old, boost::shared_ptr<Regio
 {
        RegionLock rlock (this);
 
+       bool old_sp = _splicing;
+       _splicing = true;
+
        remove_region_internal (old);
        add_region_internal (newr, pos);
 
-       if (!holding_state ()) {
-               possibly_splice_unlocked ();
-       }
+       _splicing = old_sp;
+
+       possibly_splice_unlocked (pos, (nframes64_t) old->length() - (nframes64_t) newr->length());
 }
 
 void
@@ -562,14 +612,10 @@ Playlist::remove_region (boost::shared_ptr<Region> region)
 {
        RegionLock rlock (this);
        remove_region_internal (region);
-
-       if (!holding_state ()) {
-               possibly_splice_unlocked ();
-       }
 }
 
 int
-Playlist::remove_region_internal (boost::shared_ptr<Region>region)
+Playlist::remove_region_internal (boost::shared_ptr<Region> region)
 {
        RegionList::iterator i;
        nframes_t old_length = 0;
@@ -586,8 +632,13 @@ Playlist::remove_region_internal (boost::shared_ptr<Region>region)
        for (i = regions.begin(); i != regions.end(); ++i) {
                if (*i == region) {
 
+                       nframes_t pos = (*i)->position();
+                       nframes64_t distance = (*i)->length();
+
                        regions.erase (i);
 
+                       possibly_splice_unlocked (pos, -distance);
+
                        if (!holding_state ()) {
                                relayer ();
                                remove_dependents (region);
@@ -601,6 +652,9 @@ Playlist::remove_region_internal (boost::shared_ptr<Region>region)
                        return 0;
                }
        }
+
+
+
        return -1;
 }
 
@@ -648,53 +702,64 @@ Playlist::partition (nframes_t start, nframes_t end, bool just_top_level)
 void
 Playlist::partition_internal (nframes_t start, nframes_t end, bool cutting, RegionList& thawlist)
 {
-       RegionLock rlock (this);
-       boost::shared_ptr<Region> region;
-       boost::shared_ptr<Region> current;
-       string new_name;
-       RegionList::iterator tmp;
-       OverlapType overlap;
-       nframes_t pos1, pos2, pos3, pos4;
        RegionList new_regions;
 
-       in_partition = true;
-
-       /* need to work from a copy, because otherwise the regions we add during the process
-          get operated on as well.
-       */
-
-       RegionList copy = regions;
-
-       for (RegionList::iterator i = copy.begin(); i != copy.end(); i = tmp) {
+       {
+               RegionLock rlock (this);
+               boost::shared_ptr<Region> region;
+               boost::shared_ptr<Region> current;
+               string new_name;
+               RegionList::iterator tmp;
+               OverlapType overlap;
+               nframes_t pos1, pos2, pos3, pos4;
                
-               tmp = i;
-               ++tmp;
-
-               current = *i;
+               in_partition = true;
                
-               if (current->first_frame() == start && current->last_frame() == end) {
-                       if (cutting) {
-                               remove_region_internal (current);
-                       }
-                       continue;
-               }
+               /* need to work from a copy, because otherwise the regions we add during the process
+                  get operated on as well.
+               */
                
-               if ((overlap = current->coverage (start, end)) == OverlapNone) {
-                       continue;
-               }
+               RegionList copy = regions;
                
-               pos1 = current->position();
-               pos2 = start;
-               pos3 = end;
-               pos4 = current->last_frame();
+               for (RegionList::iterator i = copy.begin(); i != copy.end(); i = tmp) {
+                       
+                       tmp = i;
+                       ++tmp;
+                       
+                       current = *i;
 
-               if (overlap == OverlapInternal) {
+                       if (current->first_frame() >= start && current->last_frame() < end) {
+                               if (cutting) {
+                                       remove_region_internal (current);
+                               }
+                               continue;
+                       }
                        
-                       /* split: we need 3 new regions, the front, middle and end.
-                          cut:   we need 2 regions, the front and end.
+                       /* 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 ((overlap = current->coverage (start, end)) == OverlapNone) {
+                               continue;
+                       }
+
+                       pos1 = current->position();
+                       pos2 = start;
+                       pos3 = end;
+                       pos4 = current->last_frame();
                        
-                       /*
+                       if (overlap == 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
@@ -703,37 +768,37 @@ Playlist::partition_internal (nframes_t start, nframes_t end, bool cutting, Regi
                          CUT
                          ---------------*****----------------====------------
                          
-                       */
+                               */
 
-                       if (!cutting) {
+                               if (!cutting) {
                                
-                               /* "middle" ++++++ */
+                                       /* "middle" ++++++ */
+                                       
+                                       _session.region_name (new_name, current->name(), false);
+                                       region = RegionFactory::create (current, pos2 - pos1, pos3 - pos2, new_name,
+                                                                       regions.size(), Region::Flag(current->flags()|Region::Automatic|Region::LeftOfSplit|Region::RightOfSplit));
+                                       add_region_internal (region, start);
+                                       new_regions.push_back (region);
+                               }
                                
+                               /* "end" ====== */
+                       
                                _session.region_name (new_name, current->name(), false);
-                               region = RegionFactory::create (current, pos2 - pos1, pos3 - pos2, new_name,
-                                                      regions.size(), Region::Flag(current->flags()|Region::Automatic|Region::LeftOfSplit|Region::RightOfSplit));
-                               add_region_internal (region, start);
+                               region = RegionFactory::create (current, pos3 - pos1, pos4 - pos3, new_name, 
+                                                               regions.size(), Region::Flag(current->flags()|Region::Automatic|Region::RightOfSplit));
+                               
+                               add_region_internal (region, end);
                                new_regions.push_back (region);
-                       }
-                       
-                       /* "end" ====== */
+                               
+                               /* "front" ***** */
                        
-                       _session.region_name (new_name, current->name(), false);
-                       region = RegionFactory::create (current, pos3 - pos1, pos4 - pos3, new_name, 
-                                              regions.size(), Region::Flag(current->flags()|Region::Automatic|Region::RightOfSplit));
-
-                       add_region_internal (region, end);
-                       new_regions.push_back (region);
+                               current->freeze ();
+                               thawlist.push_back (current);
+                               current->cut_end (pos2, this);
 
-                       /* "front" ***** */
+                       } else if (overlap == OverlapEnd) {
                                
-                       current->freeze ();
-                       thawlist.push_back (current);
-                       current->trim_end (pos2, this);
-
-               } else if (overlap == OverlapEnd) {
-
-                       /*
+                               /*
                                                              start           end
                                    ---------------*************************------------
                                                   P1           P2         P4   P3
@@ -741,33 +806,32 @@ Playlist::partition_internal (nframes_t start, nframes_t end, bool cutting, Regi
                                    ---------------**************+++++++++++------------
                                     CUT:                                                  
                                    ---------------**************-----------------------
-
-                       */
-
-                       if (!cutting) {
+                               */
                                
-                               /* end +++++ */
+                               if (!cutting) {
+                                       
+                                       /* end +++++ */
+                                       
+                                       _session.region_name (new_name, current->name(), false);
+                                       region = RegionFactory::create (current, pos2 - pos1, pos4 - pos2, new_name, (layer_t) regions.size(),
+                                                                       Region::Flag(current->flags()|Region::Automatic|Region::LeftOfSplit));
+                                       add_region_internal (region, start);
+                                       new_regions.push_back (region);
+                               }
                                
-                               _session.region_name (new_name, current->name(), false);
-                               region = RegionFactory::create (current, pos2 - pos1, pos4 - pos2, new_name, (layer_t) regions.size(),
-                                                      Region::Flag(current->flags()|Region::Automatic|Region::LeftOfSplit));
-                               add_region_internal (region, start);
-                               new_regions.push_back (region);
-                       }
-
-                       /* front ****** */
-
-                       current->freeze ();
-                       thawlist.push_back (current);
-                       current->trim_end (pos2, this);
-
-               } else if (overlap == OverlapStart) {
-
-                       /* split: we need 2 regions: the front and the end.
-                          cut: just trim current to skip the cut area
-                       */
+                               /* front ****** */
+                               
+                               current->freeze ();
+                               thawlist.push_back (current);
+                               current->cut_end (pos2, this);
+                               
+                       } else if (overlap == OverlapStart) {
+                               
+                               /* 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          
@@ -777,31 +841,31 @@ Playlist::partition_internal (nframes_t start, nframes_t end, bool cutting, Regi
                                    CUT:
                                    -------------------*********************------------
                                    
-                       */
+                               */
 
-                       if (!cutting) {
+                               if (!cutting) {
                                
-                               /* front **** */
-                                _session.region_name (new_name, current->name(), false);
-                                region = RegionFactory::create (current, 0, pos3 - pos1, new_name,
-                                                       regions.size(), Region::Flag(current->flags()|Region::Automatic|Region::RightOfSplit));
-                                add_region_internal (region, pos1);
-                                new_regions.push_back (region);
-                       } 
-                       
-                       /* end */
-                       
-                       current->freeze ();
-                       thawlist.push_back (current);
-                       current->trim_front (pos3, this);
-
-               } else if (overlap == OverlapExternal) {
-
-                       /* split: no split required.
-                          cut: remove the region.
-                       */
+                                       /* front **** */
+                                       _session.region_name (new_name, current->name(), false);
+                                       region = RegionFactory::create (current, 0, pos3 - pos1, new_name,
+                                                                       regions.size(), Region::Flag(current->flags()|Region::Automatic|Region::RightOfSplit));
+                                       add_region_internal (region, pos1);
+                                       new_regions.push_back (region);
+                               } 
+                               
+                               /* end */
                                
-                       /*
+                               current->freeze ();
+                               thawlist.push_back (current);
+                               current->trim_front (pos3, this);
+                               
+                       } else if (overlap == OverlapExternal) {
+                               
+                               /* split: no split required.
+                                  cut: remove the region.
+                               */
+                               
+                               /*
                                       start                                      end
                                    ---------------*************************------------
                                       P2          P1 P3                   P4          
@@ -811,17 +875,18 @@ Playlist::partition_internal (nframes_t start, nframes_t end, bool cutting, Regi
                                    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;
-
        for (RegionList::iterator i = new_regions.begin(); i != new_regions.end(); ++i) {
                check_dependents (*i, false);
        }
@@ -891,7 +956,6 @@ Playlist::cut (nframes_t start, nframes_t cnt, bool result_is_hidden)
        }
 
        partition_internal (start, start+cnt-1, true, thawlist);
-       possibly_splice ();
 
        for (RegionList::iterator i = thawlist.begin(); i != thawlist.end(); ++i) {
                (*i)->thaw ("playlist cut");
@@ -945,7 +1009,6 @@ Playlist::paste (boost::shared_ptr<Playlist> other, nframes_t position, float ti
                        pos += shift;
                }
 
-               possibly_splice_unlocked ();
 
                /* XXX shall we handle fractional cases at some point? */
 
@@ -984,11 +1047,68 @@ Playlist::duplicate (boost::shared_ptr<Region> region, nframes_t position, float
        }
 }
 
+void
+Playlist::shift (nframes64_t at, nframes64_t distance, bool move_intersected, bool ignore_music_glue)
+{
+       RegionLock rlock (this);
+       RegionList copy (regions);
+       RegionList fixup;
+
+       for (RegionList::iterator r = copy.begin(); r != copy.end(); ++r) {
+
+               if ((*r)->last_frame() < at) {
+                       /* too early */
+                       continue;
+               }
+               
+               if (at > (*r)->first_frame() && at < (*r)->last_frame()) {
+                       /* intersected region */
+                       if (!move_intersected) {
+                               continue;
+                       }
+               }
+               
+               /* do not move regions glued to music time - that
+                  has to be done separately.
+               */
+
+               if (!ignore_music_glue && (*r)->positional_lock_style() != Region::AudioTime) {
+                       fixup.push_back (*r);
+                       continue;
+               }
+
+               (*r)->set_position ((*r)->position() + distance, this);
+       }
+
+       for (RegionList::iterator r = fixup.begin(); r != fixup.end(); ++r) {
+               (*r)->recompute_position_from_lock_style ();
+       }
+}
+
+void
+Playlist::split (nframes64_t at)
+{
+       RegionLock rlock (this);
+       RegionList copy (regions);
+
+       /* use a copy since this operation can modify the region list
+        */
+
+       for (RegionList::iterator r = copy.begin(); r != copy.end(); ++r) {
+               _split_region (*r, at);
+       }
+}
+
 void
 Playlist::split_region (boost::shared_ptr<Region> region, nframes_t playlist_position)
 {
        RegionLock rl (this);
+       _split_region (region, playlist_position);
+}
 
+void
+Playlist::_split_region (boost::shared_ptr<Region> region, nframes_t playlist_position)
+{
        if (!region->covers (playlist_position)) {
                return;
        }
@@ -1005,10 +1125,14 @@ Playlist::split_region (boost::shared_ptr<Region> region, nframes_t playlist_pos
        string before_name;
        string after_name;
 
+       /* split doesn't change anything about length, so don't try to splice */
+       
+       bool old_sp = _splicing;
+       _splicing = true;
+
        before = playlist_position - region->position();
        after = region->length() - before;
        
-       
        _session.region_name (before_name, region->name(), false);
        left = RegionFactory::create (region, 0, before, before_name, region->layer(), Region::Flag (region->flags()|Region::LeftOfSplit));
 
@@ -1017,7 +1141,7 @@ Playlist::split_region (boost::shared_ptr<Region> region, nframes_t playlist_pos
 
        add_region_internal (left, region->position());
        add_region_internal (right, region->position() + before);
-       
+
        uint64_t orig_layer_op = region->last_layer_op();
        for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
                if ((*i)->last_layer_op() > orig_layer_op) {
@@ -1032,71 +1156,84 @@ Playlist::split_region (boost::shared_ptr<Region> region, nframes_t playlist_pos
 
        finalize_split_region (region, left, right);
        
-       if (remove_region_internal (region)) {
-               return;
-       }
+       remove_region_internal (region);
+
+       _splicing = old_sp;
 }
 
 void
-Playlist::possibly_splice ()
+Playlist::possibly_splice (nframes_t at, nframes64_t distance, boost::shared_ptr<Region> exclude)
 {
+       if (_splicing || in_set_state) {
+               /* don't respond to splicing moves or state setting */
+               return;
+       }
+
        if (_edit_mode == Splice) {
-               splice_locked ();
+               splice_locked (at, distance, exclude);
        }
 }
 
 void
-Playlist::possibly_splice_unlocked ()
+Playlist::possibly_splice_unlocked (nframes_t at, nframes64_t distance, boost::shared_ptr<Region> exclude)
 {
+       if (_splicing || in_set_state) {
+               /* don't respond to splicing moves or state setting */
+               return;
+       }
+
        if (_edit_mode == Splice) {
-               splice_unlocked ();
+               splice_unlocked (at, distance, exclude);
        }
 }
 
 void
-Playlist::splice_locked ()
+Playlist::splice_locked (nframes_t at, nframes64_t distance, boost::shared_ptr<Region> exclude)
 {
        {
                RegionLock rl (this);
-               core_splice ();
+               core_splice (at, distance, exclude);
        }
-
-       notify_length_changed ();
 }
 
 void
-Playlist::splice_unlocked ()
+Playlist::splice_unlocked (nframes_t at, nframes64_t distance, boost::shared_ptr<Region> exclude)
 {
-       core_splice ();
-       notify_length_changed ();
+       core_splice (at, distance, exclude);
 }
 
 void
-Playlist::core_splice ()
+Playlist::core_splice (nframes_t at, nframes64_t distance, boost::shared_ptr<Region> exclude)
 {
        _splicing = true;
-       
+
        for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
-               
-               RegionList::iterator next;
-               
-               next = i;
-               ++next;
-               
-               if (next == regions.end()) {
-                       break;
+
+               if (exclude && (*i) == exclude) {
+                       continue;
+               }
+
+               if ((*i)->position() >= at) {
+                       nframes64_t new_pos = (*i)->position() + distance;
+                       if (new_pos < 0) {
+                               new_pos = 0;
+                       } else if (new_pos >= max_frames - (*i)->length()) {
+                               new_pos = max_frames - (*i)->length();
+                       } 
+                               
+                       (*i)->set_position (new_pos, this);
                }
-               
-               (*next)->set_position ((*i)->last_frame() + 1, this);
        }
-       
+
        _splicing = false;
+
+       notify_length_changed ();
 }
 
 void
 Playlist::region_bounds_changed (Change what_changed, boost::shared_ptr<Region> region)
 {
-       if (in_set_state || _splicing || _nudging) {
+       if (in_set_state || _splicing || _nudging || _shuffling) {
                return;
        }
 
@@ -1119,10 +1256,24 @@ Playlist::region_bounds_changed (Change what_changed, boost::shared_ptr<Region>
 
                regions.erase (i);
                regions.insert (upper_bound (regions.begin(), regions.end(), region, cmp), region);
-
        }
 
        if (what_changed & Change (ARDOUR::PositionChanged|ARDOUR::LengthChanged)) {
+               
+               nframes64_t delta = 0;
+               
+               if (what_changed & ARDOUR::PositionChanged) {
+                       delta = (nframes64_t) region->position() - (nframes64_t) region->last_position();
+               } 
+               
+               if (what_changed & ARDOUR::LengthChanged) {
+                       delta += (nframes64_t) region->length() - (nframes64_t) region->last_length();
+               } 
+
+               if (delta) {
+                       possibly_splice (region->last_position() + region->last_length(), delta, region);
+               }
+
                if (holding_state ()) {
                        pending_bounds.push_back (region);
                } else {
@@ -1131,7 +1282,6 @@ Playlist::region_bounds_changed (Change what_changed, boost::shared_ptr<Region>
                                timestamp_layer_op (region);
                        }
                        
-                       possibly_splice ();
                        notify_length_changed ();
                        relayer ();
                        check_dependents (region, false);
@@ -1373,6 +1523,65 @@ Playlist::regions_touched (nframes_t start, nframes_t end)
        return rlist;
 }
 
+nframes64_t
+Playlist::find_next_transient (nframes64_t from, int dir)
+{
+       RegionLock rlock (this);
+       AnalysisFeatureList points;
+       AnalysisFeatureList these_points;
+
+       for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
+               if (dir > 0) {
+                       if ((*i)->last_frame() < from) {
+                               continue;
+                       }
+               } else {
+                       if ((*i)->first_frame() > from) {
+                               continue;
+                       }
+               }
+
+               (*i)->get_transients (these_points);
+
+               /* add first frame, just, err, because */
+               
+               these_points.push_back ((*i)->first_frame());
+               
+               points.insert (points.end(), these_points.begin(), these_points.end());
+               these_points.clear ();
+       }
+       
+       if (points.empty()) {
+               return -1;
+       }
+
+       TransientDetector::cleanup_transients (points, _session.frame_rate(), 3.0);
+       bool reached = false;
+       
+       if (dir > 0) {
+               for (AnalysisFeatureList::iterator x = points.begin(); x != points.end(); ++x) {
+                       if ((*x) >= from) {
+                               reached = true;
+                       }
+                       
+                       if (reached && (*x) > from) {
+                               return *x;
+                       }
+               }
+       } else {
+               for (AnalysisFeatureList::reverse_iterator x = points.rbegin(); x != points.rend(); ++x) {
+                       if ((*x) <= from) {
+                               reached = true;
+                       }
+                       
+                       if (reached && (*x) < from) {
+                               return *x;
+                       }
+               }
+       }
+
+       return -1;
+}
 
 boost::shared_ptr<Region>
 Playlist::find_next_region (nframes_t frame, RegionPoint point, int dir)
@@ -1396,7 +1605,8 @@ Playlist::find_next_region (nframes_t frame, RegionPoint point, int dir)
                        pos = r->last_frame ();
                        break;
                case SyncPoint:
-                       pos = r->adjust_to_sync (r->first_frame());
+                       pos = r->sync_position ();
+                       // r->adjust_to_sync (r->first_frame());
                        break;
                }
 
@@ -1427,6 +1637,92 @@ Playlist::find_next_region (nframes_t frame, RegionPoint point, int dir)
        return ret;
 }
 
+nframes64_t
+Playlist::find_next_region_boundary (nframes64_t frame, int dir)
+{
+       RegionLock rlock (this);
+
+       nframes64_t closest = max_frames;
+       nframes64_t ret = -1;
+
+       if (dir > 0) {
+
+               for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
+                       
+                       boost::shared_ptr<Region> r = (*i);
+                       nframes64_t distance;
+                       nframes64_t end = r->position() + r->length();
+                       bool reset;
+
+                       reset = false;
+
+                       if (r->first_frame() > frame) {
+
+                               distance = r->first_frame() - frame;
+                               
+                               if (distance < closest) {
+                                       ret = r->first_frame();
+                                       closest = distance;
+                                       reset = true;
+                               }
+                       }
+
+                       if (end > frame) {
+                               
+                               distance = end - frame;
+                               
+                               if (distance < closest) {
+                                       ret = end;
+                                       closest = distance;
+                                       reset = true;
+                               }
+                       }
+
+                       if (reset) {
+                               break;
+                       }
+               }
+
+       } else {
+
+               for (RegionList::reverse_iterator i = regions.rbegin(); i != regions.rend(); ++i) {
+                       
+                       boost::shared_ptr<Region> r = (*i);
+                       nframes64_t distance;
+                       bool reset;
+
+                       reset = false;
+
+                       if (r->last_frame() < frame) {
+
+                               distance = frame - r->last_frame();
+                               
+                               if (distance < closest) {
+                                       ret = r->last_frame();
+                                       closest = distance;
+                                       reset = true;
+                               }
+                       }
+
+                       if (r->first_frame() < frame) {
+                               distance = frame - r->last_frame();
+                               
+                               if (distance < closest) {
+                                       ret = r->first_frame();
+                                       closest = distance;
+                                       reset = true;
+                               }
+                       }
+
+                       if (reset) {
+                               break;
+                       }
+               }
+       }
+
+       return ret;
+}
+
 /***********************************************************************/
 
 
@@ -1468,10 +1764,11 @@ Playlist::set_state (const XMLNode& node)
                
                if (prop->name() == X_("name")) {
                        _name = prop->value();
+                       _set_sort_id();
                } else if (prop->name() == X_("orig_diskstream_id")) {
                        _orig_diskstream_id = prop->value ();
                } else if (prop->name() == X_("frozen")) {
-                       _frozen = (prop->value() == X_("yes"));
+                       _frozen = string_is_affirmative (prop->value());
                }
        }
 
@@ -1612,50 +1909,12 @@ Playlist::bump_name (string name, Session &session)
        string newname = name;
 
        do {
-               newname = Playlist::bump_name_once (newname);
+               newname = bump_name_once (newname);
        } while (session.playlist_by_name (newname)!=NULL);
 
        return newname;
 }
 
-string
-Playlist::bump_name_once (string name)
-{
-       string::size_type period;
-       string newname;
-
-       if ((period = name.find_last_of ('.')) == string::npos) {
-               newname  = name;
-               newname += ".1";
-       } else {
-               int isnumber = 1;
-               const char *last_element = name.c_str() + period + 1;
-               for (size_t i = 0; i < strlen(last_element); i++) {
-                       if (!isdigit(last_element[i])) {
-                               isnumber = 0;
-                               break;
-                       }
-               }
-
-               errno = 0;
-               long int version = strtol (name.c_str()+period+1, (char **)NULL, 10);
-
-               if (isnumber == 0 || errno != 0) {
-                       // last_element is not a number, or is too large
-                       newname  = name;
-                       newname += ".1";
-               } else {
-                       char buf[32];
-
-                       snprintf (buf, sizeof(buf), "%ld", version+1);
-               
-                       newname  = name.substr (0, period+1);
-                       newname += buf;
-               }
-       }
-
-       return newname;
-}
 
 layer_t
 Playlist::top_layer() const
@@ -1758,22 +2017,44 @@ void
 Playlist::raise_region_to_top (boost::shared_ptr<Region> region)
 {
        /* does nothing useful if layering mode is later=higher */
-       if ((Config->get_layer_model() == MoveAddHigher) ||
-           (Config->get_layer_model() == AddHigher)) {
-               timestamp_layer_op (region);
-               relayer ();
+       switch (Config->get_layer_model()) {
+       case LaterHigher:
+               return;
+       }
+
+       RegionList::size_type sz = regions.size();
+
+       if (region->layer() >= (sz - 1)) {
+               /* already on the top */
+               return;
        }
+
+       move_region_to_layer (sz, region, 1);
+       /* mark the region's last_layer_op as now, so that it remains on top when
+          doing future relayers (until something else takes over)
+        */
+       timestamp_layer_op (region);
 }
 
 void
 Playlist::lower_region_to_bottom (boost::shared_ptr<Region> region)
 {
        /* does nothing useful if layering mode is later=higher */
-       if ((Config->get_layer_model() == MoveAddHigher) ||
-           (Config->get_layer_model() == AddHigher)) {
-               region->set_last_layer_op (0);
-               relayer ();
+       switch (Config->get_layer_model()) {
+       case LaterHigher:
+               return;
        }
+
+       if (region->layer() == 0) {
+               /* already on the bottom */
+               return;
+       }
+
+       move_region_to_layer (0, region, -1);
+       /* force region's last layer op to zero so that it stays at the bottom
+          when doing future relayers
+       */
+       region->set_last_layer_op (0);
 }
 
 int
@@ -1954,8 +2235,147 @@ Playlist::set_frozen (bool yn)
 void
 Playlist::timestamp_layer_op (boost::shared_ptr<Region> region)
 {
-//     struct timeval tv;
-//     gettimeofday (&tv, 0);
        region->set_last_layer_op (++layer_op_counter);
 }
 
+
+void
+Playlist::shuffle (boost::shared_ptr<Region> region, int dir)
+{
+       bool moved = false;
+       nframes_t new_pos;
+
+       if (region->locked()) {
+               return;
+       }
+
+       _shuffling = true;
+
+       {
+               RegionLock rlock (const_cast<Playlist*> (this));
+               
+               
+               if (dir > 0) {
+                       
+                       RegionList::iterator next;
+
+                       for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {       
+                               if ((*i) == region) {
+                                       next = i;
+                                       ++next;
+
+                                       if (next != regions.end()) {
+
+                                               if ((*next)->locked()) {
+                                                       break;
+                                               }
+
+                                               if ((*next)->position() != region->last_frame() + 1) {
+                                                       /* they didn't used to touch, so after shuffle,
+                                                          just have them swap positions.
+                                                       */
+                                                       new_pos = (*next)->position();
+                                               } else {
+                                                       /* they used to touch, so after shuffle,
+                                                          make sure they still do. put the earlier
+                                                          region where the later one will end after
+                                                          it is moved.
+                                                       */
+                                                       new_pos = region->position() + (*next)->length();
+                                               }
+
+                                               (*next)->set_position (region->position(), this);
+                                               region->set_position (new_pos, this);
+
+                                               /* avoid a full sort */
+
+                                               regions.erase (i); // removes the region from the list */
+                                               next++;
+                                               regions.insert (next, region); // adds it back after next
+
+                                               moved = true;
+                                       }
+                                       break;
+                               }
+                       }
+               } else {
+                       
+                       RegionList::iterator prev = regions.end();
+                       
+                       for (RegionList::iterator i = regions.begin(); i != regions.end(); prev = i, ++i) {     
+                               if ((*i) == region) {
+
+                                       if (prev != regions.end()) {
+
+                                               if ((*prev)->locked()) {
+                                                       break;
+                                               }
+
+                                               if (region->position() != (*prev)->last_frame() + 1) {
+                                                       /* they didn't used to touch, so after shuffle,
+                                                          just have them swap positions.
+                                                       */
+                                                       new_pos = region->position();
+                                               } else {
+                                                       /* they used to touch, so after shuffle,
+                                                          make sure they still do. put the earlier
+                                                          one where the later one will end after
+                                                       */
+                                                       new_pos = (*prev)->position() + region->length();
+                                               }
+
+                                               region->set_position ((*prev)->position(), this);
+                                               (*prev)->set_position (new_pos, this);
+                                               
+                                               /* avoid a full sort */
+
+                                               regions.erase (i); // remove region
+                                               regions.insert (prev, region); // insert region before prev
+
+                                               moved = true;
+                                       }
+
+                                       break;
+                               }
+                       }
+               }
+       }
+
+       _shuffling = false;
+
+       if (moved) {
+
+               relayer ();
+               check_dependents (region, false);
+               
+               notify_modified();
+       }
+
+}
+
+bool
+Playlist::region_is_shuffle_constrained (boost::shared_ptr<Region>) 
+{
+       RegionLock rlock (const_cast<Playlist*> (this));
+       
+       if (regions.size() > 1) {
+               return true;
+       }
+
+       return false;
+}
+
+void
+Playlist::update_after_tempo_map_change ()
+{
+       RegionLock rlock (const_cast<Playlist*> (this));
+       RegionList copy (regions);
+
+       freeze ();
+       
+       for (RegionList::iterator i = copy.begin(); i != copy.end(); ++i) {     
+               (*i)->update_position_after_tempo_map_change ();
+       }
+
+       thaw ();
+}