X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fplaylist.cc;h=8862c633ab62fbe6578b5d5b3ed36605a174101a;hb=6349570fb24b03694e814dfff344faea92659054;hp=b146f942bdcc1273860b22f44254d3f66498863f;hpb=a2897ecef6da6a458aa1de8c2d9973a1e809dca2;p=ardour.git diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index b146f942bd..8862c633ab 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -19,17 +19,12 @@ #include #include -#include #include -#include -#include #include -#include #include #include "pbd/convert.h" -#include "pbd/failed_constructor.h" #include "pbd/stateful_diff_command.h" #include "pbd/xml++.h" @@ -52,9 +47,9 @@ using namespace ARDOUR; using namespace PBD; namespace ARDOUR { -namespace Properties { -PBD::PropertyDescriptor regions; -} + namespace Properties { + PBD::PropertyDescriptor regions; + } } struct ShowMeTheList { @@ -177,6 +172,7 @@ Playlist::Playlist (boost::shared_ptr other, string namestr, boo in_set_state--; _splicing = other->_splicing; + _rippling = other->_rippling; _nudging = other->_nudging; _edit_mode = other->_edit_mode; @@ -194,7 +190,7 @@ Playlist::Playlist (boost::shared_ptr other, framepos_t start, f , _type(other->_type) , _orig_track_id (other->_orig_track_id) { - RegionLock rlock2 (const_cast (other.get())); + RegionReadLock rlock2 (const_cast (other.get())); framepos_t end = start + cnt - 1; @@ -255,11 +251,15 @@ Playlist::Playlist (boost::shared_ptr other, framepos_t start, f plist.add (Properties::layer, region->layer()); plist.add (Properties::layering_index, region->layering_index()); - new_region = RegionFactory::RegionFactory::create (region, plist); + new_region = RegionFactory::create (region, plist); 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; } @@ -286,10 +286,10 @@ Playlist::release () void Playlist::copy_regions (RegionList& newlist) const { - RegionLock rlock (const_cast (this)); + RegionReadLock rlock (const_cast (this)); for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { - newlist.push_back (RegionFactory::RegionFactory::create (*i, true)); + newlist.push_back (RegionFactory::create (*i, true)); } } @@ -307,6 +307,7 @@ Playlist::init (bool hide) _refcnt = 0; _hidden = hide; _splicing = false; + _rippling = false; _shuffling = false; _nudging = false; in_set_state = 0; @@ -316,7 +317,9 @@ Playlist::init (bool hide) in_partition = false; subcnt = 0; _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)); @@ -329,7 +332,7 @@ Playlist::~Playlist () DEBUG_TRACE (DEBUG::Destruction, string_compose ("Playlist %1 destructor\n", _name)); { - RegionLock rl (this); + RegionReadLock rl (this); for (set >::iterator i = all_regions.begin(); i != all_regions.end(); ++i) { (*i)->set_playlist (boost::shared_ptr()); @@ -554,6 +557,7 @@ Playlist::notify_region_added (boost::shared_ptr r) pending_contents_change = false; RegionAdded (boost::weak_ptr (r)); /* EMIT SIGNAL */ ContentsChanged (); /* EMIT SIGNAL */ + } } @@ -608,41 +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 (*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 (*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 () @@ -663,7 +667,7 @@ Playlist::flush_notifications (bool from_undo) void Playlist::add_region (boost::shared_ptr region, framepos_t position, float times, bool auto_partition) { - RegionLock rlock (this); + RegionWriteLock rlock (this); times = fabs (times); int itimes = (int) floor (times); @@ -714,13 +718,13 @@ Playlist::flush_notifications (bool from_undo) } } - possibly_splice_unlocked (position, (pos + length) - position, boost::shared_ptr()); + possibly_splice_unlocked (position, (pos + length) - position, region); } void Playlist::set_region_ownership () { - RegionLock rl (this); + RegionWriteLock rl (this); RegionList::iterator i; boost::weak_ptr pl (shared_from_this()); @@ -759,10 +763,6 @@ Playlist::flush_notifications (bool from_undo) notify_region_added (region); - if (!holding_state ()) { - check_crossfades (region->range ()); - } - region->PropertyChanged.connect_same_thread (region_state_changed_connections, boost::bind (&Playlist::region_changed_proxy, this, _1, boost::weak_ptr (region))); return true; @@ -771,7 +771,7 @@ Playlist::flush_notifications (bool from_undo) void Playlist::replace_region (boost::shared_ptr old, boost::shared_ptr newr, framepos_t pos) { - RegionLock rlock (this); + RegionWriteLock rlock (this); bool old_sp = _splicing; _splicing = true; @@ -788,7 +788,7 @@ Playlist::flush_notifications (bool from_undo) void Playlist::remove_region (boost::shared_ptr region) { - RegionLock rlock (this); + RegionWriteLock rlock (this); remove_region_internal (region); } @@ -856,6 +856,17 @@ Playlist::flush_notifications (bool from_undo) } } + void + Playlist::get_source_equivalent_regions (boost::shared_ptr other, vector >& results) + { + for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { + + if ((*i) && (*i)->any_source_equivalent (other)) { + results.push_back (*i); + } + } + } + void Playlist::partition (framepos_t start, framepos_t end, bool cut) { @@ -879,7 +890,7 @@ Playlist::flush_notifications (bool from_undo) RegionList new_regions; { - RegionLock rlock (this); + RegionWriteLock rlock (this); boost::shared_ptr region; boost::shared_ptr current; @@ -1104,7 +1115,9 @@ Playlist::flush_notifications (bool from_undo) in_partition = false; } - check_crossfades (Evoral::Range (start, end)); + //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 @@ -1189,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); } @@ -1199,26 +1213,28 @@ Playlist::flush_notifications (bool from_undo) times = fabs (times); { - RegionLock rl1 (this); - RegionLock 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 (); - while (itimes--) { - for (RegionList::iterator i = other->regions.begin(); i != other->regions.end(); ++i) { - boost::shared_ptr 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); - set_layer (copy_of_region, copy_of_region->layer() + top); + { + RegionWriteLock rl1 (this); + while (itimes--) { + for (RegionList::iterator i = other->regions.begin(); i != other->regions.end(); ++i) { + boost::shared_ptr 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); + set_layer (copy_of_region, copy_of_region->layer() + top); + } + pos += shift; } - pos += shift; } } @@ -1231,7 +1247,7 @@ Playlist::flush_notifications (bool from_undo) { times = fabs (times); - RegionLock rl (this); + RegionWriteLock rl (this); int itimes = (int) floor (times); framepos_t pos = position + 1; @@ -1264,7 +1280,7 @@ Playlist::flush_notifications (bool from_undo) void Playlist::shift (framepos_t at, frameoffset_t distance, bool move_intersected, bool ignore_music_glue) { - RegionLock rlock (this); + RegionWriteLock rlock (this); RegionList copy (regions.rlist()); RegionList fixup; @@ -1303,7 +1319,7 @@ Playlist::flush_notifications (bool from_undo) void Playlist::split (framepos_t at) { - RegionLock rlock (this); + RegionWriteLock rlock (this); RegionList copy (regions.rlist()); /* use a copy since this operation can modify the region list @@ -1317,7 +1333,7 @@ Playlist::flush_notifications (bool from_undo) void Playlist::split_region (boost::shared_ptr region, framepos_t playlist_position) { - RegionLock rl (this); + RegionWriteLock rl (this); _split_region (region, playlist_position); } @@ -1400,7 +1416,7 @@ Playlist::flush_notifications (bool from_undo) if (_edit_mode == Splice) { splice_locked (at, distance, exclude); - } + } } void @@ -1420,7 +1436,7 @@ Playlist::flush_notifications (bool from_undo) Playlist::splice_locked (framepos_t at, framecnt_t distance, boost::shared_ptr exclude) { { - RegionLock rl (this); + RegionWriteLock rl (this); core_splice (at, distance, exclude); } } @@ -1457,12 +1473,63 @@ Playlist::flush_notifications (bool from_undo) _splicing = false; notify_contents_changed (); - } +} - void - Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shared_ptr region) - { - if (in_set_state || _splicing || _nudging || _shuffling) { +void +Playlist::ripple_locked (framepos_t at, framecnt_t distance, RegionList *exclude) +{ + { + RegionWriteLock rl (this); + core_ripple (at, distance, exclude); + } +} + +void +Playlist::ripple_unlocked (framepos_t at, framecnt_t distance, RegionList *exclude) +{ + core_ripple (at, distance, exclude); +} + +void +Playlist::core_ripple (framepos_t at, framecnt_t distance, RegionList *exclude) +{ + if (distance == 0) { + return; + } + + _rippling = true; + RegionListProperty copy = regions; + for (RegionList::iterator i = copy.begin(); i != copy.end(); ++i) { + assert (i != copy.end()); + + if (exclude) { + if (std::find(exclude->begin(), exclude->end(), (*i)) != exclude->end()) { + continue; + } + } + + if ((*i)->position() >= at) { + framepos_t new_pos = (*i)->position() + distance; + framepos_t limit = max_framepos - (*i)->length(); + if (new_pos < 0) { + new_pos = 0; + } else if (new_pos >= limit ) { + new_pos = limit; + } + + (*i)->set_position (new_pos); + } + } + + _rippling = false; + notify_contents_changed (); +} + + +void +Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shared_ptr region) +{ + if (in_set_state || _splicing || _rippling || _nudging || _shuffling) { return; } @@ -1559,10 +1626,6 @@ Playlist::flush_notifications (bool from_undo) save = !(_splicing || _nudging); } - if (what_changed.contains (our_interests) && !what_changed.contains (pos_and_length)) { - check_crossfades (region->range ()); - } - if (what_changed.contains (Properties::position) && !what_changed.contains (Properties::length)) { notify_region_moved (region); } else if (!what_changed.contains (Properties::position) && what_changed.contains (Properties::length)) { @@ -1579,13 +1642,15 @@ Playlist::flush_notifications (bool from_undo) save = true; } + mark_session_dirty (); + return save; } void Playlist::drop_regions () { - RegionLock rl (this); + RegionWriteLock rl (this); regions.clear (); all_regions.clear (); } @@ -1593,7 +1658,7 @@ Playlist::flush_notifications (bool from_undo) void Playlist::sync_all_regions_with_regions () { - RegionLock rl (this); + RegionWriteLock rl (this); all_regions.clear (); @@ -1606,7 +1671,7 @@ Playlist::flush_notifications (bool from_undo) Playlist::clear (bool with_signals) { { - RegionLock rl (this); + RegionWriteLock rl (this); region_state_changed_connections.drop_connections (); @@ -1641,14 +1706,14 @@ Playlist::flush_notifications (bool from_undo) boost::shared_ptr Playlist::regions_at (framepos_t frame) { - RegionLock rlock (this); + RegionReadLock rlock (this); return find_regions_at (frame); } uint32_t Playlist::count_regions_at (framepos_t frame) const { - RegionLock rlock (const_cast(this)); + RegionReadLock rlock (const_cast(this)); uint32_t cnt = 0; for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { @@ -1664,7 +1729,7 @@ Playlist::regions_at (framepos_t frame) Playlist::top_region_at (framepos_t frame) { - RegionLock rlock (this); + RegionReadLock rlock (this); boost::shared_ptr rlist = find_regions_at (frame); boost::shared_ptr region; @@ -1681,7 +1746,7 @@ Playlist::regions_at (framepos_t frame) Playlist::top_unmuted_region_at (framepos_t frame) { - RegionLock rlock (this); + RegionReadLock rlock (this); boost::shared_ptr rlist = find_regions_at (frame); for (RegionList::iterator i = rlist->begin(); i != rlist->end(); ) { @@ -1726,7 +1791,7 @@ Playlist::find_regions_at (framepos_t frame) boost::shared_ptr Playlist::regions_with_start_within (Evoral::Range range) { - RegionLock rlock (this); + RegionReadLock rlock (this); boost::shared_ptr rlist (new RegionList); for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { @@ -1741,7 +1806,7 @@ Playlist::regions_with_start_within (Evoral::Range range) boost::shared_ptr Playlist::regions_with_end_within (Evoral::Range range) { - RegionLock rlock (this); + RegionReadLock rlock (this); boost::shared_ptr rlist (new RegionList); for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { @@ -1760,7 +1825,13 @@ Playlist::regions_with_end_within (Evoral::Range range) boost::shared_ptr Playlist::regions_touched (framepos_t start, framepos_t end) { - RegionLock rlock (this); + RegionReadLock rlock (this); + return regions_touched_locked (start, end); +} + +boost::shared_ptr +Playlist::regions_touched_locked (framepos_t start, framepos_t end) +{ boost::shared_ptr rlist (new RegionList); for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { @@ -1772,131 +1843,130 @@ Playlist::regions_touched (framepos_t start, framepos_t end) return rlist; } - framepos_t - Playlist::find_next_transient (framepos_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 - Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir) - { - RegionLock rlock (this); - boost::shared_ptr 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 r = (*i); - framepos_t pos = 0; - - switch (point) { - case Start: - pos = r->first_frame (); - break; - case End: - pos = r->last_frame (); - break; - case SyncPoint: - pos = r->sync_position (); - break; - } - - switch (dir) { - case 1: /* forwards */ - - if (pos > frame) { - if ((distance = pos - frame) < closest) { - closest = distance; - ret = r; - end_iter = true; - } - } - - break; - - default: /* backwards */ - - if (pos < frame) { - if ((distance = frame - pos) < closest) { - closest = distance; - ret = r; - } - } - else { - end_iter = true; - } - - break; - } - } +framepos_t +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) { + 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; +} - return ret; - } +boost::shared_ptr +Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir) +{ + RegionReadLock rlock (this); + boost::shared_ptr 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 r = (*i); + framepos_t pos = 0; + + switch (point) { + case Start: + pos = r->first_frame (); + break; + case End: + pos = r->last_frame (); + break; + case SyncPoint: + pos = r->sync_position (); + break; + } + + switch (dir) { + case 1: /* forwards */ + + if (pos > frame) { + if ((distance = pos - frame) < closest) { + closest = distance; + ret = r; + end_iter = true; + } + } + + break; + + default: /* backwards */ + + if (pos < frame) { + if ((distance = frame - pos) < closest) { + closest = distance; + ret = r; + } + } else { + end_iter = true; + } + + break; + } + } + + return ret; +} framepos_t Playlist::find_next_region_boundary (framepos_t frame, int dir) { - RegionLock rlock (this); + RegionReadLock rlock (this); framepos_t closest = max_framepos; framepos_t ret = -1; @@ -1978,14 +2048,14 @@ Playlist::regions_touched (framepos_t start, framepos_t end) void Playlist::rdiff (vector& cmds) const { - RegionLock rlock (const_cast (this)); + RegionReadLock rlock (const_cast (this)); Stateful::rdiff (cmds); } void Playlist::clear_owned_changes () { - RegionLock rlock (this); + RegionReadLock rlock (this); Stateful::clear_owned_changes (); } @@ -1997,11 +2067,11 @@ Playlist::regions_touched (framepos_t start, framepos_t end) freeze (); /* add the added regions */ - for (RegionListProperty::ChangeContainer::iterator i = change.added.begin(); i != change.added.end(); ++i) { + for (RegionListProperty::ChangeContainer::const_iterator i = change.added.begin(); i != change.added.end(); ++i) { add_region_internal ((*i), (*i)->position()); } /* remove the removed regions */ - for (RegionListProperty::ChangeContainer::iterator i = change.removed.begin(); i != change.removed.end(); ++i) { + for (RegionListProperty::ChangeContainer::const_iterator i = change.removed.begin(); i != change.removed.end(); ++i) { remove_region (*i); } @@ -2090,7 +2160,7 @@ Playlist::regions_touched (framepos_t start, framepos_t end) } { - RegionLock rlock (this); + RegionWriteLock rlock (this); add_region_internal (region, region->position()); } @@ -2101,15 +2171,6 @@ Playlist::regions_touched (framepos_t start, framepos_t end) if (seen_region_nodes && regions.empty()) { ret = -1; - } else { - - /* update dependents, which was not done during add_region_internal - due to in_set_state being true - */ - - for (RegionList::iterator r = regions.begin(); r != regions.end(); ++r) { - check_crossfades ((*r)->range ()); - } } thaw (); @@ -2150,7 +2211,7 @@ Playlist::state (bool full_state) node->add_property (X_("frozen"), _frozen ? "yes" : "no"); if (full_state) { - RegionLock rlock (this, false); + RegionReadLock rlock (this); snprintf (buf, sizeof (buf), "%u", _combine_ops); node->add_property ("combine-ops", buf); @@ -2170,24 +2231,42 @@ Playlist::state (bool full_state) bool Playlist::empty() const { - RegionLock rlock (const_cast(this), false); + RegionReadLock rlock (const_cast(this)); return regions.empty(); } uint32_t Playlist::n_regions() const { - RegionLock rlock (const_cast(this), false); + RegionReadLock rlock (const_cast(this)); return regions.size(); } +/** @return true if the all_regions list is empty, ie this playlist + * has never had a region added to it. + */ +bool +Playlist::all_regions_empty() const +{ + RegionReadLock rl (const_cast (this)); + return all_regions.empty(); +} + pair Playlist::get_extent () const { - RegionLock rlock (const_cast(this), false); + RegionReadLock rlock (const_cast(this)); return _get_extent (); } +pair +Playlist::get_extent_with_endspace () const +{ + pair l = get_extent(); + l.second += _end_space; + return l; +} + pair Playlist::_get_extent () const { @@ -2227,7 +2306,7 @@ Playlist::bump_name (string name, Session &session) layer_t Playlist::top_layer() const { - RegionLock rlock (const_cast (this)); + RegionReadLock rlock (const_cast (this)); layer_t top = 0; for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { @@ -2256,7 +2335,10 @@ struct RelayerSort { void Playlist::set_layer (boost::shared_ptr region, double new_layer) { - /* Remove the layer we are setting from our region list, and sort it */ + /* Remove the layer we are setting from our region list, and sort it + * using the layer indeces. + */ + RegionList copy = regions.rlist(); copy.remove (region); copy.sort (RelayerSort ()); @@ -2276,14 +2358,20 @@ Playlist::set_layer (boost::shared_ptr region, double new_layer) } void -Playlist::setup_layering_indices (RegionList const & regions) const +Playlist::setup_layering_indices (RegionList const & regions) { uint64_t j = 0; + for (RegionList::const_iterator k = regions.begin(); k != regions.end(); ++k) { (*k)->set_layering_index (j++); } } +struct LaterHigherSort { + bool operator () (boost::shared_ptr a, boost::shared_ptr b) { + return a->position() < b->position(); + } +}; /** Take the layering indices of each of our regions, compute the layers * that they should be on, and write the layers back to the regions. @@ -2319,9 +2407,16 @@ Playlist::relayer () vector > layers; layers.push_back (vector (divisions)); - /* Sort our regions into layering index order */ + /* Sort our regions into layering index order (for manual layering) or position order (for later is higher)*/ RegionList copy = regions.rlist(); - copy.sort (RelayerSort ()); + switch (Config->get_layer_model()) { + case LaterHigher: + copy.sort (LaterHigherSort ()); + break; + case Manual: + copy.sort (RelayerSort ()); + break; + } DEBUG_TRACE (DEBUG::Layering, "relayer() using:\n"); for (RegionList::iterator i = copy.begin(); i != copy.end(); ++i) { @@ -2400,7 +2495,7 @@ Playlist::relayer () notify_layering_changed (); /* This relayer() may have been called as a result of a region removal, in which - case we need to setup layering indices so account for the one that has just + case we need to setup layering indices to account for the one that has just gone away. */ setup_layering_indices (copy); @@ -2443,7 +2538,7 @@ Playlist::nudge_after (framepos_t start, framecnt_t distance, bool forwards) _nudging = true; { - RegionLock rlock (const_cast (this)); + RegionWriteLock rlock (const_cast (this)); for (i = regions.begin(); i != regions.end(); ++i) { @@ -2484,9 +2579,9 @@ Playlist::nudge_after (framepos_t start, framecnt_t distance, bool forwards) bool Playlist::uses_source (boost::shared_ptr src) const { - RegionLock rlock (const_cast (this)); + RegionReadLock rlock (const_cast (this)); - for (set >::iterator r = all_regions.begin(); r != all_regions.end(); ++r) { + for (set >::const_iterator r = all_regions.begin(); r != all_regions.end(); ++r) { if ((*r)->uses_source (src)) { return true; } @@ -2498,7 +2593,7 @@ Playlist::uses_source (boost::shared_ptr src) const boost::shared_ptr Playlist::find_region (const ID& id) const { - RegionLock rlock (const_cast (this)); + RegionReadLock rlock (const_cast (this)); /* searches all regions currently in use by the playlist */ @@ -2514,7 +2609,7 @@ Playlist::find_region (const ID& id) const uint32_t Playlist::region_use_count (boost::shared_ptr r) const { - RegionLock rlock (const_cast (this)); + RegionReadLock rlock (const_cast (this)); uint32_t cnt = 0; for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { @@ -2523,6 +2618,29 @@ Playlist::region_use_count (boost::shared_ptr 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 ps = boost::dynamic_pointer_cast(*s); + if (!ps) continue; + if (ps->playlist()->region_use_count(it->first)) { + // break out of both loops + return ++cnt; + } + } + } + } return cnt; } @@ -2531,7 +2649,7 @@ Playlist::region_by_id (const ID& id) const { /* searches all regions ever added to this playlist */ - for (set >::iterator i = all_regions.begin(); i != all_regions.end(); ++i) { + for (set >::const_iterator i = all_regions.begin(); i != all_regions.end(); ++i) { if ((*i)->id() == id) { return *i; } @@ -2577,10 +2695,8 @@ Playlist::shuffle (boost::shared_ptr region, int dir) _shuffling = true; - Evoral::Range old_range = region->range (); - { - RegionLock rlock (const_cast (this)); + RegionWriteLock rlock (const_cast (this)); if (dir > 0) { @@ -2677,12 +2793,6 @@ Playlist::shuffle (boost::shared_ptr region, int dir) if (moved) { relayer (); - - list > xf; - xf.push_back (old_range); - xf.push_back (region->range ()); - coalesce_and_check_crossfades (xf); - notify_contents_changed(); } @@ -2691,7 +2801,7 @@ Playlist::shuffle (boost::shared_ptr region, int dir) bool Playlist::region_is_shuffle_constrained (boost::shared_ptr) { - RegionLock rlock (const_cast (this)); + RegionReadLock rlock (const_cast (this)); if (regions.size() > 1) { return true; @@ -2700,10 +2810,16 @@ Playlist::region_is_shuffle_constrained (boost::shared_ptr) return false; } +void +Playlist::ripple (framepos_t at, framecnt_t distance, RegionList *exclude) +{ + ripple_locked (at, distance, exclude); +} + void Playlist::update_after_tempo_map_change () { - RegionLock rlock (const_cast (this)); + RegionWriteLock rlock (const_cast (this)); RegionList copy (regions.rlist()); freeze (); @@ -2718,7 +2834,7 @@ Playlist::update_after_tempo_map_change () void Playlist::foreach_region (boost::function)> s) { - RegionLock rl (this, false); + RegionWriteLock rl (this, false); for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { s (*i); } @@ -2727,7 +2843,7 @@ Playlist::foreach_region (boost::function)> s) bool Playlist::has_region_at (framepos_t const p) const { - RegionLock (const_cast (this)); + RegionReadLock (const_cast (this)); RegionList::const_iterator i = regions.begin (); while (i != regions.end() && !(*i)->covers (p)) { @@ -2741,7 +2857,7 @@ Playlist::has_region_at (framepos_t const p) const void Playlist::remove_region_by_source (boost::shared_ptr s) { - RegionLock rl (this); + RegionWriteLock rl (this); RegionList::iterator i = regions.begin(); while (i != regions.end()) { @@ -2764,7 +2880,7 @@ Playlist::remove_region_by_source (boost::shared_ptr s) framepos_t Playlist::find_next_top_layer_position (framepos_t t) const { - RegionLock rlock (const_cast (this)); + RegionReadLock rlock (const_cast (this)); layer_t const top = top_layer (); @@ -2815,7 +2931,14 @@ Playlist::combine (const RegionList& r) pl->in_partition = true; - for (RegionList::const_iterator i = r.begin(); i != r.end(); ++i) { + /* sort by position then layer. + * route_time_axis passes 'selected_regions' - which is not sorted. + * here we need the top-most first, then every layer's region sorted by position. + */ + RegionList sorted(r); + sorted.sort(RegionSortByLayerAndPosition()); + + for (RegionList::const_iterator i = sorted.begin(); i != sorted.end(); ++i) { /* copy the region */ @@ -2831,6 +2954,7 @@ Playlist::combine (const RegionList& r) /* make position relative to zero */ pl->add_region (copied_region, original_region->position() - earliest_position); + copied_region->set_layer (original_region->layer ()); /* use the maximum number of channels for any region */ @@ -2959,6 +3083,7 @@ Playlist::uncombine (boost::shared_ptr target) } boost::shared_ptr original (ca->second); + cassocs.erase(ca); bool modified_region; if (i == rl.begin()) { @@ -3055,16 +3180,30 @@ Playlist::uncombine (boost::shared_ptr target) for (vector >::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; thaw (); } +void +Playlist::fade_range (list& ranges) +{ + for (list::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); + } + } +} + uint32_t Playlist::max_source_level () const { - RegionLock rlock (const_cast (this)); + RegionReadLock rlock (const_cast (this)); uint32_t lvl = 0; for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { @@ -3080,6 +3219,9 @@ Playlist::set_orig_track_id (const PBD::ID& id) _orig_track_id = id; } +/** Take a list of ranges, coalesce any that can be coalesced, then call + * check_crossfades for each one. + */ void Playlist::coalesce_and_check_crossfades (list > ranges) { @@ -3097,6 +3239,7 @@ restart: continue; } + // XXX i->from can be > i->to - is this right? coverage() will return OverlapNone in this case if (Evoral::coverage (i->from, i->to, j->from, j->to) != Evoral::OverlapNone) { i->from = min (i->from, j->from); i->to = max (i->to, j->to); @@ -3105,8 +3248,10 @@ restart: } } } +} - for (list >::iterator i = ranges.begin(); i != ranges.end(); ++i) { - check_crossfades (*i); - } +void +Playlist::set_capture_insertion_in_progress (bool yn) +{ + _capture_insertion_underway = yn; }