Automation of LV2 plugin properties.

[ardour.git] / libs / ardour / playlist.cc

diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 4214e9031d1db571dd01df7c6247db4302aca03f..ff2f524398207c0d9e822a64ee5a40efc584dacd 100644 (file)
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -256,6 +256,10 @@ Playlist::Playlist (boost::shared_ptr<const Playlist> other, framepos_t start, f
                add_region_internal (new_region, position);
        }
 
+       //keep track of any dead space at end (for pasting into Ripple or Splice mode)
+       //at the end of construction, any length of cnt beyond the extents of the regions is end_space
+       _end_space = cnt - (get_extent().second - get_extent().first);
+
        in_set_state--;
        first_set_state = false;
 }
@@ -315,6 +319,7 @@ Playlist::init (bool hide)
        _frozen = false;
        _capture_insertion_underway = false;
        _combine_ops = 0;
+       _end_space = 0;
 
        _session.history().BeginUndoRedo.connect_same_thread (*this, boost::bind (&Playlist::begin_undo, this));
        _session.history().EndUndoRedo.connect_same_thread (*this, boost::bind (&Playlist::end_undo, this));
@@ -552,6 +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 */
+               
        }
 }
 
@@ -606,37 +612,41 @@ Playlist::flush_notifications (bool from_undo)
                */
        }
 
-       if (((regions_changed || pending_contents_change) && !in_set_state) || pending_layering) {
+       /* notify about contents/region changes first so that layering changes
+        * in a UI will take place on the new contents.
+        */
+
+       if (regions_changed || pending_contents_change) {
+               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);
+       }
 
-        if (regions_changed || pending_contents_change) {
-                pending_contents_change = false;
-                ContentsChanged (); /* EMIT SIGNAL */
-        }
-
-        for (s = pending_adds.begin(); s != pending_adds.end(); ++s) {
-                (*s)->clear_changes ();
-                RegionAdded (boost::weak_ptr<Region> (*s)); /* EMIT SIGNAL */
-        }
-
-        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);
-        }
-
-        clear_pending ();
+       clear_pending ();
 
-        in_flush = false;
- }
+       in_flush = false;
+}
 
  void
  Playlist::clear_pending ()
@@ -1104,6 +1114,10 @@ Playlist::flush_notifications (bool from_undo)
 
                 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;
  }
 
  boost::shared_ptr<Playlist>
@@ -1188,7 +1202,8 @@ Playlist::flush_notifications (bool from_undo)
         new_name += '.';
         new_name += buf;
 
-        cnt = min (_get_extent().second - start, cnt);
+       // 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);
  }
 
@@ -2242,6 +2257,14 @@ Playlist::get_extent () const
        return _get_extent ();
 }
 
+pair<framepos_t, framepos_t>
+Playlist::get_extent_with_endspace () const
+{
+       pair<framepos_t, framepos_t> l = get_extent();
+       l.second += _end_space;
+       return l;
+}
+
 pair<framepos_t, framepos_t>
 Playlist::_get_extent () const
 {
@@ -2578,6 +2601,29 @@ Playlist::region_use_count (boost::shared_ptr<Region> r) const
                }
        }
 
+       RegionFactory::CompoundAssociations& cassocs (RegionFactory::compound_associations());
+       for (RegionFactory::CompoundAssociations::iterator it = cassocs.begin(); it != cassocs.end(); ++it) {
+               /* check if region is used in a compound */
+               if (it->second == r) {
+                       /* region is referenced as 'original' of a compound */
+                       ++cnt;
+                       break;
+               }
+               if (r->whole_file() && r->max_source_level() > 0) {
+                       /* region itself ia a compound.
+                        * the compound regions are not referenced -> check regions inside compound
+                        */
+                       const SourceList& sl = r->sources();
+                       for (SourceList::const_iterator s = sl.begin(); s != sl.end(); ++s) {
+                               boost::shared_ptr<PlaylistSource> ps = boost::dynamic_pointer_cast<PlaylistSource>(*s);
+                               if (!ps) continue;
+                               if (ps->playlist()->region_use_count(it->first)) {
+                                       // break out of both loops
+                                       return ++cnt;
+                               }
+                       }
+               }
+       }
        return cnt;
 }
 
@@ -3020,6 +3066,7 @@ Playlist::uncombine (boost::shared_ptr<Region> target)
                }
 
                boost::shared_ptr<Region> original (ca->second);
+               cassocs.erase(ca);
                bool modified_region;
 
                if (i == rl.begin()) {
@@ -3117,6 +3164,9 @@ Playlist::uncombine (boost::shared_ptr<Region> target)
        for (vector<boost::shared_ptr<Region> >::iterator i = originals.begin(); i != originals.end(); ++i) {
                add_region ((*i), (*i)->position());
                set_layer((*i), (*i)->layer());
+               if (!RegionFactory::region_by_id((*i)->id())) {
+                       RegionFactory::map_add(*i);
+               }
        }
 
        in_partition = false;