fix crash when copy'ing latent plugins
[ardour.git] / libs / ardour / playlist.cc
index 60ede59ca94ea97aa7de65b022cfb5847972e7a6..70744429f9416bff8cc93ad214133d403312a75b 100644 (file)
@@ -40,7 +40,7 @@
 #include "ardour/session_playlists.h"
 #include "ardour/source_factory.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -141,7 +141,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
 
@@ -557,7 +557,7 @@ Playlist::notify_region_added (boost::shared_ptr<Region> r)
                pending_contents_change = false;
                RegionAdded (boost::weak_ptr<Region> (r)); /* EMIT SIGNAL */
                ContentsChanged (); /* EMIT SIGNAL */
-               
+
        }
 }
 
@@ -603,7 +603,7 @@ Playlist::flush_notifications (bool from_undo)
                remove_dependents (*s);
                RegionRemoved (boost::weak_ptr<Region> (*s)); /* EMIT SIGNAL */
        }
-       
+
        for (s = pending_adds.begin(); s != pending_adds.end(); ++s) {
                crossfade_ranges.push_back ((*s)->range ());
                /* don't emit RegionAdded signal until relayering is done,
@@ -620,25 +620,25 @@ Playlist::flush_notifications (bool from_undo)
                pending_layering = true;
                ContentsChanged (); /* EMIT SIGNAL */
        }
-       
+
        for (s = pending_adds.begin(); s != pending_adds.end(); ++s) {
                (*s)->clear_changes ();
                RegionAdded (boost::weak_ptr<Region> (*s)); /* EMIT SIGNAL */
        }
-       
+
        if ((regions_changed && !in_set_state) || pending_layering) {
                relayer ();
        }
-       
+
        coalesce_and_check_crossfades (crossfade_ranges);
-       
+
        if (!pending_range_moves.empty ()) {
                /* We don't need to check crossfades for these as pending_bounds has
                   already covered it.
                */
                RangesMoved (pending_range_moves, from_undo);
        }
-       
+
        if (!pending_region_extensions.empty ()) {
                RegionsExtended (pending_region_extensions);
        }
@@ -657,6 +657,7 @@ Playlist::flush_notifications (bool from_undo)
         pending_range_moves.clear ();
         pending_region_extensions.clear ();
         pending_contents_change = false;
+        pending_layering = false;
  }
 
  /*************************************************************
@@ -665,7 +666,7 @@ Playlist::flush_notifications (bool from_undo)
 
 /** 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)
+ Playlist::add_region (boost::shared_ptr<Region> region, framepos_t position, float times, bool auto_partition, const int32_t sub_num)
  {
         RegionWriteLock rlock (this);
         times = fabs (times);
@@ -679,7 +680,7 @@ Playlist::flush_notifications (bool from_undo)
         }
 
         if (itimes >= 1) {
-                add_region_internal (region, pos);
+                add_region_internal (region, pos, sub_num);
                 set_layer (region, DBL_MAX);
                 pos += region->length();
                 --itimes;
@@ -691,8 +692,8 @@ Playlist::flush_notifications (bool from_undo)
         */
 
         for (int i = 0; i < itimes; ++i) {
-                boost::shared_ptr<Region> copy = RegionFactory::create (region, true);
-                add_region_internal (copy, pos);
+                boost::shared_ptr<Region> copy = RegionFactory::create (region, true, sub_num);
+                add_region_internal (copy, pos, sub_num);
                 set_layer (copy, DBL_MAX);
                 pos += region->length();
         }
@@ -713,7 +714,7 @@ Playlist::flush_notifications (bool from_undo)
                         plist.add (Properties::layer, region->layer());
 
                         boost::shared_ptr<Region> sub = RegionFactory::create (region, plist);
-                        add_region_internal (sub, pos);
+                        add_region_internal (sub, pos, sub_num);
                         set_layer (sub, DBL_MAX);
                 }
         }
@@ -734,7 +735,7 @@ Playlist::flush_notifications (bool from_undo)
  }
 
  bool
- Playlist::add_region_internal (boost::shared_ptr<Region> region, framepos_t position)
+ Playlist::add_region_internal (boost::shared_ptr<Region> region, framepos_t position, const int32_t sub_num)
  {
         if (region->data_type() != _type) {
                 return false;
@@ -747,7 +748,7 @@ Playlist::flush_notifications (bool from_undo)
                 region->set_playlist (boost::weak_ptr<Playlist>(foo));
         }
 
-        region->set_position (position);
+        region->set_position (position, sub_num);
 
         regions.insert (upper_bound (regions.begin(), regions.end(), region, cmp), region);
         all_regions.insert (region);
@@ -1146,7 +1147,7 @@ Playlist::flush_notifications (bool from_undo)
                            chopped.
                         */
 
-                        ret->paste (pl, (*i).start - start, 1.0f);
+                        ret->paste (pl, (*i).start - start, 1.0f, 0);
                 }
         }
 
@@ -1208,7 +1209,7 @@ Playlist::flush_notifications (bool from_undo)
  }
 
  int
- Playlist::paste (boost::shared_ptr<Playlist> other, framepos_t position, float times)
+ Playlist::paste (boost::shared_ptr<Playlist> other, framepos_t position, float times, const int32_t sub_num)
  {
         times = fabs (times);
 
@@ -1225,12 +1226,12 @@ Playlist::flush_notifications (bool from_undo)
                         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.
                                         */
-                                        
-                                        add_region_internal (copy_of_region, (*i)->position() + pos);
+
+                                        add_region_internal (copy_of_region, (*i)->position() + pos, sub_num);
                                         set_layer (copy_of_region, copy_of_region->layer() + top);
                                 }
                                 pos += shift;
@@ -1244,18 +1245,24 @@ Playlist::flush_notifications (bool from_undo)
 
  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);
 
         RegionWriteLock rl (this);
         int itimes = (int) floor (times);
-        framepos_t pos = position + 1;
 
         while (itimes--) {
                 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 += region->length();
+                position += gap;
         }
 
         if (floor (times) != times) {
@@ -1271,12 +1278,78 @@ 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);
                 }
         }
  }
 
+/** @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);
+
+        while (position + region->length() - 1 < end) {
+                boost::shared_ptr<Region> copy = RegionFactory::create (region, true);
+                add_region_internal (copy, position);
+                set_layer (copy, DBL_MAX);
+                position += gap;
+        }
+
+        if (position < end) {
+                framecnt_t length = min (region->length(), end - position);
+                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);
+                }
+        }
+}
+
+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;
+
+       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, 1.0f, 0); // times ??
+       }
+}
+
  void
  Playlist::shift (framepos_t at, frameoffset_t distance, bool move_intersected, bool ignore_music_glue)
  {
@@ -1312,12 +1385,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 (framepos_t at, const int32_t sub_num)
  {
         RegionWriteLock rlock (this);
         RegionList copy (regions.rlist());
@@ -1326,19 +1399,19 @@ Playlist::flush_notifications (bool from_undo)
          */
 
         for (RegionList::iterator r = copy.begin(); r != copy.end(); ++r) {
-                _split_region (*r, at);
+                _split_region (*r, at, sub_num);
         }
  }
 
  void
- Playlist::split_region (boost::shared_ptr<Region> region, framepos_t playlist_position)
+ Playlist::split_region (boost::shared_ptr<Region> region, framepos_t playlist_position, const int32_t sub_num)
  {
         RegionWriteLock rl (this);
-        _split_region (region, playlist_position);
+        _split_region (region, playlist_position, sub_num);
  }
 
  void
- Playlist::_split_region (boost::shared_ptr<Region> region, framepos_t playlist_position)
+ Playlist::_split_region (boost::shared_ptr<Region> region, framepos_t playlist_position, const int32_t sub_num)
  {
         if (!region->covers (playlist_position)) {
                 return;
@@ -1369,7 +1442,6 @@ Playlist::flush_notifications (bool from_undo)
         {
                 PropertyList plist;
 
-                plist.add (Properties::position, region->position ());
                 plist.add (Properties::length, before);
                 plist.add (Properties::name, before_name);
                 plist.add (Properties::left_of_split, true);
@@ -1380,7 +1452,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, 0, plist, true, sub_num);
         }
 
         RegionFactory::region_name (after_name, region->name(), false);
@@ -1388,7 +1460,6 @@ Playlist::flush_notifications (bool from_undo)
         {
                 PropertyList plist;
 
-                plist.add (Properties::position, region->position() + before);
                 plist.add (Properties::length, after);
                 plist.add (Properties::name, after_name);
                 plist.add (Properties::right_of_split, true);
@@ -1396,7 +1467,7 @@ Playlist::flush_notifications (bool from_undo)
                 plist.add (Properties::layer, region->layer ());
 
                 /* same note as above */
-                right = RegionFactory::create (region, before, plist);
+                right = RegionFactory::create (region, before, plist, true, sub_num);
         }
 
         add_region_internal (left, region->position());
@@ -1416,7 +1487,7 @@ Playlist::flush_notifications (bool from_undo)
 
         if (_edit_mode == Splice) {
                 splice_locked (at, distance, exclude);
-        } 
+        }
  }
 
  void
@@ -1515,8 +1586,8 @@ Playlist::core_ripple (framepos_t at, framecnt_t distance, RegionList *exclude)
                                new_pos = 0;
                        } else if (new_pos >= limit ) {
                                new_pos = limit;
-                       } 
-                               
+                       }
+
                        (*i)->set_position (new_pos);
                }
        }
@@ -1642,8 +1713,8 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar
                 save = true;
         }
 
-     mark_session_dirty ();
-     
+        mark_session_dirty ();
+
         return save;
  }
 
@@ -1699,10 +1770,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)
 {
@@ -1752,6 +1841,7 @@ Playlist::regions_at (framepos_t frame)
         for (RegionList::iterator i = rlist->begin(); i != rlist->end(); ) {
 
                 RegionList::iterator tmp = i;
+
                 ++tmp;
 
                 if ((*i)->muted()) {
@@ -1776,15 +1866,15 @@ boost::shared_ptr<RegionList>
 Playlist::find_regions_at (framepos_t frame)
 {
        /* Caller must hold lock */
-       
+
        boost::shared_ptr<RegionList> rlist (new RegionList);
-       
+
        for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
                if ((*i)->covers (frame)) {
                        rlist->push_back (*i);
                }
        }
-       
+
        return rlist;
 }
 
@@ -1833,13 +1923,13 @@ boost::shared_ptr<RegionList>
 Playlist::regions_touched_locked (framepos_t start, framepos_t end)
 {
        boost::shared_ptr<RegionList> rlist (new RegionList);
-       
+
        for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
                if ((*i)->coverage (start, end) != Evoral::OverlapNone) {
                        rlist->push_back (*i);
                }
        }
-       
+
        return rlist;
 }
 
@@ -1849,7 +1939,7 @@ Playlist::find_next_transient (framepos_t from, int dir)
        RegionReadLock 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) {
@@ -1860,30 +1950,30 @@ Playlist::find_next_transient (framepos_t from, int dir)
                                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) {
+               for (AnalysisFeatureList::const_iterator x = points.begin(); x != points.end(); ++x) {
                        if ((*x) >= from) {
                                reached = true;
                        }
-                       
+
                        if (reached && (*x) > from) {
                                return *x;
                        }
@@ -1893,13 +1983,13 @@ Playlist::find_next_transient (framepos_t from, int dir)
                        if ((*x) <= from) {
                                reached = true;
                        }
-                       
+
                        if (reached && (*x) < from) {
                                return *x;
                        }
                }
        }
-       
+
        return -1;
 }
 
@@ -1909,17 +1999,17 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
        RegionReadLock rlock (this);
        boost::shared_ptr<Region> ret;
        framepos_t closest = max_framepos;
-       
+
        bool end_iter = false;
-       
+
        for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
-               
+
                if(end_iter) break;
-               
+
                frameoffset_t distance;
                boost::shared_ptr<Region> r = (*i);
                framepos_t pos = 0;
-               
+
                switch (point) {
                case Start:
                        pos = r->first_frame ();
@@ -1931,10 +2021,10 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
                        pos = r->sync_position ();
                        break;
                }
-               
+
                switch (dir) {
                case 1: /* forwards */
-                       
+
                        if (pos > frame) {
                                if ((distance = pos - frame) < closest) {
                                        closest = distance;
@@ -1942,11 +2032,11 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
                                        end_iter = true;
                                }
                        }
-                       
+
                        break;
-                       
+
                default: /* backwards */
-                       
+
                        if (pos < frame) {
                                if ((distance = frame - pos) < closest) {
                                        closest = distance;
@@ -1955,11 +2045,11 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
                        } else {
                                end_iter = true;
                        }
-                       
+
                        break;
                }
        }
-       
+
        return ret;
 }
 
@@ -1977,23 +2067,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;
                                 }
                         }
@@ -2005,23 +2097,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;
                                 }
                         }
@@ -2086,7 +2180,7 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
         XMLNodeConstIterator niter;
         XMLPropertyList plist;
         XMLPropertyConstIterator piter;
-        XMLProperty *prop;
+        XMLProperty const * prop;
         boost::shared_ptr<Region> region;
         string region_name;
         bool seen_region_nodes = false;
@@ -2163,7 +2257,7 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
                                 RegionWriteLock rlock (this);
                                 add_region_internal (region, region->position());
                         }
-                       
+
                        region->resume_property_changes ();
 
                }
@@ -2172,7 +2266,7 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
        if (seen_region_nodes && regions.empty()) {
                ret = -1;
        }
-               
+
        thaw ();
        notify_contents_changed ();
 
@@ -2351,7 +2445,7 @@ Playlist::set_layer (boost::shared_ptr<Region> region, double new_layer)
                }
                ++i;
        }
-       
+
        copy.insert (i, region);
 
        setup_layering_indices (copy);
@@ -2577,12 +2671,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;
                }
        }
@@ -2590,6 +2690,7 @@ Playlist::uses_source (boost::shared_ptr<const Source> src) const
        return false;
 }
 
+
 boost::shared_ptr<Region>
 Playlist::find_region (const ID& id) const
 {
@@ -2827,14 +2928,14 @@ 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 ();
 }
 
 void
 Playlist::foreach_region (boost::function<void(boost::shared_ptr<Region>)> s)
 {
-       RegionWriteLock rl (this, false);
+       RegionReadLock rl (this);
        for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
                s (*i);
        }
@@ -2853,25 +2954,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.
@@ -3056,7 +3138,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;
 
@@ -3103,7 +3185,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.
                 */