X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fplaylist.cc;h=239622a38c3252e3242dcd9e2ddbd37ff81f5edb;hb=fa73112f081ee38bc5c9752f900c9c5dccb68141;hp=77666977fc279687b16bed36a83712ab6e73b7a6;hpb=e85ff4dad26ef13b0351de0dfd92ce22022cd611;p=ardour.git diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 77666977fc..239622a38c 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -557,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 */ + } } @@ -602,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, @@ -611,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 () @@ -1220,11 +1225,11 @@ 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); set_layer (copy_of_region, copy_of_region->layer() + top); } @@ -1239,18 +1244,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) { @@ -1266,12 +1277,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); +} + +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); // times ?? + } +} + void Playlist::shift (framepos_t at, frameoffset_t distance, bool move_intersected, bool ignore_music_glue) { @@ -1364,7 +1441,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); @@ -1383,7 +1459,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); @@ -1411,7 +1486,7 @@ Playlist::flush_notifications (bool from_undo) if (_edit_mode == Splice) { splice_locked (at, distance, exclude); - } + } } void @@ -1510,8 +1585,8 @@ Playlist::core_ripple (framepos_t at, framecnt_t distance, RegionList *exclude) new_pos = 0; } else if (new_pos >= limit ) { new_pos = limit; - } - + } + (*i)->set_position (new_pos); } } @@ -1637,6 +1712,8 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar save = true; } + mark_session_dirty (); + return save; } @@ -1692,7 +1769,7 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar } - /*********************************************************************** + /* ********************************************************************* FINDING THINGS **********************************************************************/ @@ -1769,15 +1846,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; } @@ -1826,13 +1903,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; } @@ -1842,7 +1919,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) { @@ -1853,30 +1930,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) { if ((*x) >= from) { reached = true; } - + if (reached && (*x) > from) { return *x; } @@ -1886,13 +1963,13 @@ Playlist::find_next_transient (framepos_t from, int dir) if ((*x) <= from) { reached = true; } - + if (reached && (*x) < from) { return *x; } } } - + return -1; } @@ -1902,17 +1979,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 (); @@ -1924,10 +2001,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; @@ -1935,11 +2012,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; @@ -1948,11 +2025,11 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir) } else { end_iter = true; } - + break; } } - + return ret; } @@ -2156,7 +2233,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 (); } @@ -2165,7 +2242,7 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir) if (seen_region_nodes && regions.empty()) { ret = -1; } - + thaw (); notify_contents_changed (); @@ -2328,7 +2405,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 ()); @@ -2341,7 +2421,7 @@ Playlist::set_layer (boost::shared_ptr region, double new_layer) } ++i; } - + copy.insert (i, region); setup_layering_indices (copy); @@ -2351,13 +2431,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. */ @@ -2392,9 +2477,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) { @@ -2596,6 +2688,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; } @@ -2789,7 +2904,7 @@ Playlist::update_after_tempo_map_change () 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); } @@ -3038,6 +3153,7 @@ Playlist::uncombine (boost::shared_ptr target) } boost::shared_ptr original (ca->second); + cassocs.erase(ca); bool modified_region; if (i == rl.begin()) { @@ -3057,7 +3173,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. */ @@ -3135,6 +3251,9 @@ 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; @@ -3190,6 +3309,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);