X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Fplaylist.cc;h=70744429f9416bff8cc93ad214133d403312a75b;hp=47462a3575be3b19274698290d9dbf861f68a3d8;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=848e75aaeaa04a81883ed30bcd04abd862f9d1fd diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 47462a3575..70744429f9 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -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 @@ -172,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; @@ -255,6 +256,10 @@ Playlist::Playlist (boost::shared_ptr 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; } @@ -302,6 +307,7 @@ Playlist::init (bool hide) _refcnt = 0; _hidden = hide; _splicing = false; + _rippling = false; _shuffling = false; _nudging = false; in_set_state = 0; @@ -313,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)); @@ -550,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 */ + } } @@ -595,7 +603,7 @@ Playlist::flush_notifications (bool from_undo) remove_dependents (*s); RegionRemoved (boost::weak_ptr (*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, @@ -604,37 +612,41 @@ Playlist::flush_notifications (bool from_undo) */ } - if (((regions_changed || pending_contents_change) && !in_set_state) || pending_layering) { - relayer (); + /* 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 */ } - 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 */ + } - 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); + 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_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 (!pending_region_extensions.empty ()) { + RegionsExtended (pending_region_extensions); + } - clear_pending (); + clear_pending (); - in_flush = false; - } + in_flush = false; +} void Playlist::clear_pending () @@ -645,6 +657,7 @@ Playlist::flush_notifications (bool from_undo) pending_range_moves.clear (); pending_region_extensions.clear (); pending_contents_change = false; + pending_layering = false; } /************************************************************* @@ -653,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, framepos_t position, float times, bool auto_partition) + Playlist::add_region (boost::shared_ptr region, framepos_t position, float times, bool auto_partition, const int32_t sub_num) { RegionWriteLock rlock (this); times = fabs (times); @@ -667,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; @@ -679,8 +692,8 @@ Playlist::flush_notifications (bool from_undo) */ for (int i = 0; i < itimes; ++i) { - boost::shared_ptr copy = RegionFactory::create (region, true); - add_region_internal (copy, pos); + boost::shared_ptr copy = RegionFactory::create (region, true, sub_num); + add_region_internal (copy, pos, sub_num); set_layer (copy, DBL_MAX); pos += region->length(); } @@ -701,12 +714,12 @@ Playlist::flush_notifications (bool from_undo) plist.add (Properties::layer, region->layer()); boost::shared_ptr sub = RegionFactory::create (region, plist); - add_region_internal (sub, pos); + add_region_internal (sub, pos, sub_num); set_layer (sub, DBL_MAX); } } - possibly_splice_unlocked (position, (pos + length) - position, boost::shared_ptr()); + possibly_splice_unlocked (position, (pos + length) - position, region); } void @@ -722,7 +735,7 @@ Playlist::flush_notifications (bool from_undo) } bool - Playlist::add_region_internal (boost::shared_ptr region, framepos_t position) + Playlist::add_region_internal (boost::shared_ptr region, framepos_t position, const int32_t sub_num) { if (region->data_type() != _type) { return false; @@ -735,7 +748,7 @@ Playlist::flush_notifications (bool from_undo) region->set_playlist (boost::weak_ptr(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); @@ -1102,6 +1115,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 @@ -1130,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); } } @@ -1186,12 +1203,13 @@ 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); } int - Playlist::paste (boost::shared_ptr other, framepos_t position, float times) + Playlist::paste (boost::shared_ptr other, framepos_t position, float times, const int32_t sub_num) { times = fabs (times); @@ -1208,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 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; @@ -1227,18 +1245,24 @@ Playlist::flush_notifications (bool from_undo) void Playlist::duplicate (boost::shared_ptr 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, 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 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) { @@ -1254,12 +1278,78 @@ Playlist::flush_notifications (bool from_undo) plist.add (Properties::name, name); boost::shared_ptr 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, framepos_t position, framecnt_t gap, framepos_t end) +{ + RegionWriteLock rl (this); + + while (position + region->length() - 1 < end) { + boost::shared_ptr 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 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 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& ranges, float /* times */) +{ + if (ranges.empty()) { + return; + } + + framepos_t min_pos = max_framepos; + framepos_t max_pos = 0; + + for (std::list::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::iterator i = ranges.begin(); i != ranges.end(); ++i) { + boost::shared_ptr 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) { @@ -1295,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()); @@ -1309,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, framepos_t playlist_position) + Playlist::split_region (boost::shared_ptr 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, framepos_t playlist_position) + Playlist::_split_region (boost::shared_ptr region, framepos_t playlist_position, const int32_t sub_num) { if (!region->covers (playlist_position)) { return; @@ -1352,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); @@ -1363,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); @@ -1371,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); @@ -1379,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()); @@ -1456,12 +1544,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; } @@ -1574,6 +1713,8 @@ Playlist::flush_notifications (bool from_undo) save = true; } + mark_session_dirty (); + return save; } @@ -1629,10 +1770,28 @@ Playlist::flush_notifications (bool from_undo) } - /*********************************************************************** + /* ********************************************************************* FINDING THINGS **********************************************************************/ +boost::shared_ptr +Playlist::region_list() +{ + RegionReadLock rlock (this); + boost::shared_ptr rlist (new RegionList (regions.rlist ())); + return rlist; +} + +void +Playlist::deep_sources (std::set >& sources) const +{ + RegionReadLock rlock (const_cast(this)); + + for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { + (*i)->deep_sources (sources); + } +} + boost::shared_ptr Playlist::regions_at (framepos_t frame) { @@ -1682,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()) { @@ -1706,15 +1866,15 @@ boost::shared_ptr Playlist::find_regions_at (framepos_t frame) { /* Caller must hold lock */ - + boost::shared_ptr rlist (new RegionList); - + for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { if ((*i)->covers (frame)) { rlist->push_back (*i); } } - + return rlist; } @@ -1763,13 +1923,13 @@ 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) { if ((*i)->coverage (start, end) != Evoral::OverlapNone) { rlist->push_back (*i); } } - + return rlist; } @@ -1779,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) { @@ -1790,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; } @@ -1823,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; } @@ -1839,17 +1999,17 @@ 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 (); @@ -1861,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; @@ -1872,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; @@ -1885,11 +2045,11 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir) } else { end_iter = true; } - + break; } } - + return ret; } @@ -1907,23 +2067,25 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir) boost::shared_ptr 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; } } @@ -1935,23 +2097,25 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir) boost::shared_ptr 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; } } @@ -2016,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; string region_name; bool seen_region_nodes = false; @@ -2093,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 (); } @@ -2102,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 (); @@ -2189,6 +2353,14 @@ Playlist::get_extent () const 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 { @@ -2257,7 +2429,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 ()); @@ -2270,7 +2445,7 @@ Playlist::set_layer (boost::shared_ptr region, double new_layer) } ++i; } - + copy.insert (i, region); setup_layering_indices (copy); @@ -2280,13 +2455,18 @@ void Playlist::setup_layering_indices (RegionList const & regions) { uint64_t j = 0; - list > xf; 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. */ @@ -2321,9 +2501,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) { @@ -2484,12 +2671,18 @@ Playlist::nudge_after (framepos_t start, framecnt_t distance, bool forwards) } bool -Playlist::uses_source (boost::shared_ptr src) const +Playlist::uses_source (boost::shared_ptr src, bool shallow) const { RegionReadLock rlock (const_cast (this)); for (set >::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; } } @@ -2497,6 +2690,7 @@ Playlist::uses_source (boost::shared_ptr src) const return false; } + boost::shared_ptr Playlist::find_region (const ID& id) const { @@ -2525,6 +2719,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; } @@ -2694,6 +2911,12 @@ 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 () { @@ -2705,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)> s) { - RegionWriteLock rl (this, false); + RegionReadLock rl (this); for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { s (*i); } @@ -2731,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 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. @@ -2809,7 +3013,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 */ @@ -2927,7 +3138,7 @@ Playlist::uncombine (boost::shared_ptr 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; @@ -2954,6 +3165,7 @@ Playlist::uncombine (boost::shared_ptr target) } boost::shared_ptr original (ca->second); + cassocs.erase(ca); bool modified_region; if (i == rl.begin()) { @@ -2973,7 +3185,7 @@ Playlist::uncombine (boost::shared_ptr 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. */ @@ -3050,12 +3262,26 @@ 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 { @@ -3095,6 +3321,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);