X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fplaylist.cc;h=b5b32a10d4d2b0dded67974891daed003a320ddf;hb=4bdbe77414b956e27f2c1631e67189c70409a3d1;hp=a4860eba992095cf15ef84e309a33850c08fe5ac;hpb=535d25c1419a6a24294e2d494dd678997fd0ae22;p=ardour.git diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index a4860eba99..b5b32a10d4 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -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 @@ -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; @@ -692,7 +693,7 @@ 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); + 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; @@ -1316,6 +1317,39 @@ Playlist::duplicate_until (boost::shared_ptr region, framepos_t position } } +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) { @@ -1351,12 +1385,12 @@ Playlist::duplicate_until (boost::shared_ptr region, framepos_t position /* 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()); @@ -1365,19 +1399,19 @@ Playlist::duplicate_until (boost::shared_ptr region, framepos_t position */ 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; @@ -1408,7 +1442,6 @@ Playlist::duplicate_until (boost::shared_ptr region, framepos_t position { 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); @@ -1419,7 +1452,7 @@ Playlist::duplicate_until (boost::shared_ptr region, framepos_t position 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); @@ -1427,7 +1460,6 @@ Playlist::duplicate_until (boost::shared_ptr region, framepos_t position { 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); @@ -1435,7 +1467,7 @@ Playlist::duplicate_until (boost::shared_ptr region, framepos_t position 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()); @@ -1738,10 +1770,28 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar } - /*********************************************************************** + /* ********************************************************************* 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) { @@ -1791,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()) { @@ -1918,7 +1969,7 @@ Playlist::find_next_transient (framepos_t from, int dir) 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; } @@ -2016,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; } } @@ -2044,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; } } @@ -2125,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; @@ -2616,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; } } @@ -2629,6 +2690,7 @@ Playlist::uses_source (boost::shared_ptr src) const return false; } + boost::shared_ptr Playlist::find_region (const ID& id) const { @@ -2868,6 +2930,7 @@ Playlist::update_after_tempo_map_change () } thaw (); + notify_contents_changed(); } void @@ -2892,25 +2955,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. @@ -3095,7 +3139,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; @@ -3142,7 +3186,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. */