X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fplaylist.cc;h=70744429f9416bff8cc93ad214133d403312a75b;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hp=eaee1c4326659fbb24b767fd90422e1402456ea3;hpb=fce6ac0ef6cbf410715a02b59d9d41d3290710a0;p=ardour.git diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index eaee1c4326..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; @@ -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, 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); @@ -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 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(); } @@ -713,7 +714,7 @@ 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); } } @@ -734,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; @@ -747,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); @@ -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 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); @@ -1230,7 +1231,7 @@ Playlist::flush_notifications (bool from_undo) 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; @@ -1321,7 +1322,7 @@ 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); + paste (pl, range.start + offset, times, 0); } void @@ -1345,7 +1346,7 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) 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); // times ?? + paste (pl, (*i).start + offset, 1.0f, 0); // times ?? } } @@ -1384,12 +1385,12 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) /* 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()); @@ -1398,19 +1399,19 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) */ 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; @@ -1451,7 +1452,7 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) 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); @@ -1466,7 +1467,7 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) 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()); @@ -1774,12 +1775,23 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar **********************************************************************/ boost::shared_ptr -Playlist::region_list() { +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) { @@ -2659,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; } } @@ -2672,6 +2690,7 @@ Playlist::uses_source (boost::shared_ptr src) const return false; } + boost::shared_ptr Playlist::find_region (const ID& id) const { @@ -2909,9 +2928,8 @@ 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 (); - notify_contents_changed(); } void @@ -2936,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.