X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fplaylist.cc;h=885f592bf26db9fd6bc6dc0ed60f7bc47b9c62e3;hb=204baa31d842d4c2f833d319b6fa55e402a1bfb8;hp=1eebafba5adc9d91e02fd2534efeacabb496f535;hpb=86cb9348e829e61b7c1e324930882af147f504c9;p=ardour.git diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 1eebafba5a..885f592bf2 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -30,7 +30,6 @@ #include "pbd/convert.h" #include "pbd/failed_constructor.h" -#include "pbd/stacktrace.h" #include "pbd/stateful_diff_command.h" #include "pbd/xml++.h" @@ -187,9 +186,6 @@ Playlist::Playlist (boost::shared_ptr other, string namestr, boo in_partition = false; subcnt = 0; _frozen = other->_frozen; - - layer_op_counter = other->layer_op_counter; - freeze_length = other->freeze_length; } Playlist::Playlist (boost::shared_ptr other, framepos_t start, framecnt_t cnt, string str, bool hide) @@ -257,6 +253,7 @@ Playlist::Playlist (boost::shared_ptr other, framepos_t start, f plist.add (Properties::length, len); plist.add (Properties::name, new_name); plist.add (Properties::layer, region->layer()); + plist.add (Properties::layering_index, region->layering_index()); new_region = RegionFactory::RegionFactory::create (region, plist); @@ -313,16 +310,13 @@ Playlist::init (bool hide) _shuffling = false; _nudging = false; in_set_state = 0; - in_update = false; + in_undo = false; _edit_mode = Config->get_edit_mode(); in_flush = false; in_partition = false; subcnt = 0; _frozen = false; - layer_op_counter = 0; - freeze_length = 0; _combine_ops = 0; - _relayer_suspended = false; _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)); @@ -402,7 +396,7 @@ Playlist::set_name (const string& str) void Playlist::begin_undo () { - in_update = true; + in_undo = true; freeze (); } @@ -410,7 +404,7 @@ void Playlist::end_undo () { thaw (true); - in_update = false; + in_undo = false; } void @@ -433,7 +427,6 @@ void Playlist::delay_notifications () { g_atomic_int_inc (&block_notifications); - freeze_length = _get_extent().second; } /** @param from_undo true if this release is triggered by the end of an undo on this playlist */ @@ -488,8 +481,6 @@ Playlist::notify_region_moved (boost::shared_ptr r) { Evoral::RangeMove const move (r->last_position (), r->length (), r->position ()); - /* We could timestamp the region's layer op here, but we're doing it in region_bounds_changed */ - if (holding_state ()) { pending_range_moves.push_back (move); @@ -506,8 +497,6 @@ Playlist::notify_region_moved (boost::shared_ptr r) void Playlist::notify_region_start_trimmed (boost::shared_ptr r) { - timestamp_layer_op (LayerOpBoundsChange, r); - if (r->position() >= r->last_position()) { /* trimmed shorter */ return; @@ -531,8 +520,6 @@ Playlist::notify_region_start_trimmed (boost::shared_ptr r) void Playlist::notify_region_end_trimmed (boost::shared_ptr r) { - timestamp_layer_op (LayerOpBoundsChange, r); - if (r->length() < r->last_length()) { /* trimmed shorter */ } @@ -559,8 +546,6 @@ Playlist::notify_region_added (boost::shared_ptr r) as though it could be. */ - timestamp_layer_op (LayerOpAdd, r); - if (holding_state()) { pending_adds.insert (r); pending_contents_change = true; @@ -569,7 +554,6 @@ Playlist::notify_region_added (boost::shared_ptr r) pending_contents_change = false; RegionAdded (boost::weak_ptr (r)); /* EMIT SIGNAL */ ContentsChanged (); /* EMIT SIGNAL */ - relayer (r); } } @@ -579,7 +563,7 @@ Playlist::flush_notifications (bool from_undo) { set > dependent_checks_needed; set >::iterator s; - uint32_t regions_changed = false; + bool regions_changed = false; if (in_flush) { return; @@ -587,35 +571,31 @@ Playlist::flush_notifications (bool from_undo) in_flush = true; - /* We have: - - pending_bounds: regions whose bounds position and/or length changes - pending_removes: regions which were removed - pending_adds: regions which were added - pending_length: true if the playlist length might have changed - pending_contents_change: true if there was almost any change in the playlist - pending_range_moves: details of periods of time that have been moved about (when regions have been moved) - - */ - if (!pending_bounds.empty() || !pending_removes.empty() || !pending_adds.empty()) { regions_changed = true; } - /* Make a list of regions that need relayering */ - RegionList regions_to_relayer; + /* we have no idea what order the regions ended up in pending + bounds (it could be based on selection order, for example). + so, to preserve layering in the "most recently moved is higher" + model, sort them by existing layer, then timestamp them. + */ + + // RegionSortByLayer cmp; + // pending_bounds.sort (cmp); for (RegionList::iterator r = pending_bounds.begin(); r != pending_bounds.end(); ++r) { - regions_to_relayer.push_back (*r); dependent_checks_needed.insert (*r); } for (s = pending_removes.begin(); s != pending_removes.end(); ++s) { remove_dependents (*s); + // cerr << _name << " sends RegionRemoved\n"; RegionRemoved (boost::weak_ptr (*s)); /* EMIT SIGNAL */ } for (s = pending_adds.begin(); s != pending_adds.end(); ++s) { + // cerr << _name << " sends RegionAdded\n"; /* don't emit RegionAdded signal until relayering is done, so that the region is fully setup by the time anyone hear's that its been added @@ -623,6 +603,14 @@ Playlist::flush_notifications (bool from_undo) dependent_checks_needed.insert (*s); } + if ( + ((regions_changed || pending_contents_change) && !in_set_state) || + pending_layering + ) { + + relayer (); + } + if (regions_changed || pending_contents_change) { pending_contents_change = false; ContentsChanged (); /* EMIT SIGNAL */ @@ -631,7 +619,6 @@ Playlist::flush_notifications (bool from_undo) for (s = pending_adds.begin(); s != pending_adds.end(); ++s) { (*s)->clear_changes (); RegionAdded (boost::weak_ptr (*s)); /* EMIT SIGNAL */ - regions_to_relayer.push_back (*s); } for (s = dependent_checks_needed.begin(); s != dependent_checks_needed.end(); ++s) { @@ -646,10 +633,6 @@ Playlist::flush_notifications (bool from_undo) RegionsExtended (pending_region_extensions); } - if (!regions_to_relayer.empty ()) { - relayer (regions_to_relayer); - } - clear_pending (); in_flush = false; @@ -670,6 +653,7 @@ Playlist::flush_notifications (bool from_undo) PLAYLIST OPERATIONS *************************************************************/ +/** 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) { @@ -686,6 +670,7 @@ Playlist::flush_notifications (bool from_undo) if (itimes >= 1) { add_region_internal (region, pos); + set_layer (region, DBL_MAX); pos += region->length(); --itimes; } @@ -698,6 +683,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); + set_layer (copy, DBL_MAX); pos += region->length(); } @@ -718,6 +704,7 @@ Playlist::flush_notifications (bool from_undo) boost::shared_ptr sub = RegionFactory::create (region, plist); add_region_internal (sub, pos); + set_layer (sub, DBL_MAX); } } @@ -757,6 +744,11 @@ Playlist::flush_notifications (bool from_undo) possibly_splice_unlocked (position, region->length(), region); + if (!holding_state ()) { + /* layers get assigned from XML state, and are not reset during undo/redo */ + relayer (); + } + /* we need to notify the existence of new region before checking dependents. Ick. */ notify_region_added (region); @@ -780,6 +772,7 @@ Playlist::flush_notifications (bool from_undo) remove_region_internal (old); add_region_internal (newr, pos); + set_layer (newr, old->layer ()); _splicing = old_sp; @@ -816,6 +809,7 @@ Playlist::flush_notifications (bool from_undo) possibly_splice_unlocked (pos, -distance); if (!holding_state ()) { + relayer (); remove_dependents (region); } @@ -833,13 +827,13 @@ Playlist::flush_notifications (bool from_undo) if (Config->get_use_overlap_equivalency()) { for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { if ((*i)->overlap_equivalent (other)) { - results.push_back ((*i)); + results.push_back (*i); } } } else { for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { if ((*i)->equivalent (other)) { - results.push_back ((*i)); + results.push_back (*i); } } } @@ -872,16 +866,12 @@ Playlist::flush_notifications (bool from_undo) * start and end if cutting == true. Regions that lie entirely within start and end are always * removed. */ + void Playlist::partition_internal (framepos_t start, framepos_t end, bool cutting, RegionList& thawlist) { RegionList new_regions; - /* Don't relayer regions that are created during this operation; leave them - on the same region as the original. - */ - suspend_relayer (); - { RegionLock rlock (this); @@ -960,7 +950,8 @@ Playlist::flush_notifications (bool from_undo) plist.add (Properties::start, current->start() + (pos2 - pos1)); plist.add (Properties::length, pos3 - pos2); plist.add (Properties::name, new_name); - plist.add (Properties::layer, current->layer()); + plist.add (Properties::layer, current->layer ()); + plist.add (Properties::layering_index, current->layering_index ()); plist.add (Properties::automatic, true); plist.add (Properties::left_of_split, true); plist.add (Properties::right_of_split, true); @@ -979,7 +970,8 @@ Playlist::flush_notifications (bool from_undo) plist.add (Properties::start, current->start() + (pos3 - pos1)); plist.add (Properties::length, pos4 - pos3); plist.add (Properties::name, new_name); - plist.add (Properties::layer, current->layer()); + plist.add (Properties::layer, current->layer ()); + plist.add (Properties::layering_index, current->layering_index ()); plist.add (Properties::automatic, true); plist.add (Properties::right_of_split, true); @@ -1017,7 +1009,8 @@ Playlist::flush_notifications (bool from_undo) plist.add (Properties::start, current->start() + (pos2 - pos1)); plist.add (Properties::length, pos4 - pos2); plist.add (Properties::name, new_name); - plist.add (Properties::layer, current->layer()); + plist.add (Properties::layer, current->layer ()); + plist.add (Properties::layering_index, current->layering_index ()); plist.add (Properties::automatic, true); plist.add (Properties::left_of_split, true); @@ -1060,7 +1053,8 @@ Playlist::flush_notifications (bool from_undo) plist.add (Properties::start, current->start()); plist.add (Properties::length, pos3 - pos1); plist.add (Properties::name, new_name); - plist.add (Properties::layer, current->layer()); + plist.add (Properties::layer, current->layer ()); + plist.add (Properties::layering_index, current->layering_index ()); plist.add (Properties::automatic, true); plist.add (Properties::right_of_split, true); @@ -1107,8 +1101,6 @@ Playlist::flush_notifications (bool from_undo) for (RegionList::iterator i = new_regions.begin(); i != new_regions.end(); ++i) { check_dependents (*i, false); } - - resume_relayer (); } boost::shared_ptr @@ -1209,7 +1201,7 @@ Playlist::flush_notifications (bool from_undo) int itimes = (int) floor (times); framepos_t pos = position; framecnt_t const shift = other->_get_extent().second; - layer_t top_layer = regions.size(); + layer_t top = top_layer (); while (itimes--) { for (RegionList::iterator i = other->regions.begin(); i != other->regions.end(); ++i) { @@ -1219,8 +1211,8 @@ Playlist::flush_notifications (bool from_undo) the ordering they had in the original playlist. */ - copy_of_region->set_layer (copy_of_region->layer() + top_layer); add_region_internal (copy_of_region, (*i)->position() + pos); + set_layer (copy_of_region, copy_of_region->layer() + top); } pos += shift; } @@ -1242,6 +1234,7 @@ Playlist::flush_notifications (bool from_undo) while (itimes--) { boost::shared_ptr copy = RegionFactory::create (region, true); add_region_internal (copy, pos); + set_layer (copy, DBL_MAX); pos += region->length(); } @@ -1259,6 +1252,7 @@ Playlist::flush_notifications (bool from_undo) boost::shared_ptr sub = RegionFactory::create (region, plist); add_region_internal (sub, pos); + set_layer (sub, DBL_MAX); } } } @@ -1359,6 +1353,8 @@ Playlist::flush_notifications (bool from_undo) plist.add (Properties::length, before); plist.add (Properties::name, before_name); plist.add (Properties::left_of_split, true); + plist.add (Properties::layering_index, region->layering_index ()); + plist.add (Properties::layer, region->layer ()); /* note: we must use the version of ::create with an offset here, since it supplies that offset to the Region constructor, which @@ -1376,6 +1372,8 @@ Playlist::flush_notifications (bool from_undo) plist.add (Properties::length, after); plist.add (Properties::name, after_name); plist.add (Properties::right_of_split, true); + plist.add (Properties::layering_index, region->layering_index ()); + plist.add (Properties::layer, region->layer ()); /* same note as above */ right = RegionFactory::create (region, before, plist); @@ -1469,8 +1467,6 @@ Playlist::flush_notifications (bool from_undo) if (what_changed.contains (Properties::position)) { - timestamp_layer_op (LayerOpBoundsChange, region); - /* remove it from the list then add it back in the right place again. */ @@ -1511,7 +1507,7 @@ Playlist::flush_notifications (bool from_undo) pending_bounds.push_back (region); } else { notify_contents_changed (); - relayer (region); + relayer (); check_dependents (region, false); } } @@ -1571,6 +1567,10 @@ Playlist::flush_notifications (bool from_undo) notify_region_start_trimmed (region); } + /* don't notify about layer changes, since we are the only object that can initiate + them, and we notify in ::relayer() + */ + if (what_changed.contains (our_interests)) { save = true; } @@ -1634,13 +1634,12 @@ Playlist::flush_notifications (bool from_undo) FINDING THINGS **********************************************************************/ - Playlist::RegionList * - Playlist::regions_at (framepos_t frame) - - { - RegionLock rlock (this); - return find_regions_at (frame); - } +boost::shared_ptr +Playlist::regions_at (framepos_t frame) +{ + RegionLock rlock (this); + return find_regions_at (frame); +} uint32_t Playlist::count_regions_at (framepos_t frame) const @@ -1662,7 +1661,7 @@ Playlist::flush_notifications (bool from_undo) { RegionLock rlock (this); - RegionList *rlist = find_regions_at (frame); + boost::shared_ptr rlist = find_regions_at (frame); boost::shared_ptr region; if (rlist->size()) { @@ -1671,7 +1670,6 @@ Playlist::flush_notifications (bool from_undo) region = rlist->back(); } - delete rlist; return region; } @@ -1680,7 +1678,7 @@ Playlist::flush_notifications (bool from_undo) { RegionLock rlock (this); - RegionList *rlist = find_regions_at (frame); + boost::shared_ptr rlist = find_regions_at (frame); for (RegionList::iterator i = rlist->begin(); i != rlist->end(); ) { @@ -1702,13 +1700,12 @@ Playlist::flush_notifications (bool from_undo) region = rlist->back(); } - delete rlist; return region; } - Playlist::RegionList* - Playlist::regions_to_read (framepos_t start, framepos_t end) - { +boost::shared_ptr +Playlist::regions_to_read (framepos_t start, framepos_t end) +{ /* Caller must hold lock */ RegionList covering; @@ -1772,7 +1769,7 @@ Playlist::flush_notifications (bool from_undo) } } - RegionList* rlist = new RegionList; + boost::shared_ptr rlist (new RegionList); /* find all the regions that cover each position .... */ @@ -1841,36 +1838,36 @@ Playlist::flush_notifications (bool from_undo) return rlist; } - Playlist::RegionList * - Playlist::find_regions_at (framepos_t frame) - { - /* Caller must hold lock */ - - RegionList *rlist = new RegionList; - - for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { - if ((*i)->covers (frame)) { - rlist->push_back (*i); - } - } - - return rlist; - } - - Playlist::RegionList * - Playlist::regions_touched (framepos_t start, framepos_t end) - { - RegionLock rlock (this); - RegionList *rlist = new RegionList; +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)->coverage (start, end) != OverlapNone) { - rlist->push_back (*i); - } - } + for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { + if ((*i)->covers (frame)) { + rlist->push_back (*i); + } + } + + return rlist; +} +boost::shared_ptr +Playlist::regions_touched (framepos_t start, framepos_t end) +{ + RegionLock rlock (this); + boost::shared_ptr rlist (new RegionList); + + for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { + if ((*i)->coverage (start, end) != OverlapNone) { + rlist->push_back (*i); + } + } + return rlist; - } +} framepos_t Playlist::find_next_transient (framepos_t from, int dir) @@ -2098,7 +2095,7 @@ Playlist::flush_notifications (bool from_undo) freeze (); /* add the added regions */ for (RegionListProperty::ChangeContainer::iterator i = change.added.begin(); i != change.added.end(); ++i) { - add_region ((*i), (*i)->position()); + add_region_internal ((*i), (*i)->position()); } /* remove the removed regions */ for (RegionListProperty::ChangeContainer::iterator i = change.removed.begin(); i != change.removed.end(); ++i) { @@ -2129,7 +2126,6 @@ Playlist::flush_notifications (bool from_undo) return -1; } - suspend_relayer (); freeze (); plist = node.properties(); @@ -2190,8 +2186,11 @@ Playlist::flush_notifications (bool from_undo) return -1; } - add_region (region, region->position(), 1.0); - + { + RegionLock rlock (this); + add_region_internal (region, region->position()); + } + region->resume_property_changes (); } @@ -2212,10 +2211,10 @@ Playlist::flush_notifications (bool from_undo) thaw (); notify_contents_changed (); - resume_relayer (); in_set_state--; first_set_state = false; + return ret; } @@ -2340,279 +2339,196 @@ Playlist::set_edit_mode (EditMode mode) _edit_mode = mode; } -/** Relayer a region. See the other relayer() methods for commentary. */ +struct RelayerSort { + bool operator () (boost::shared_ptr a, boost::shared_ptr b) { + return a->layering_index() < b->layering_index(); + } +}; + +/** Set a new layer for a region. This adjusts the layering indices of all + * regions in the playlist to put the specified region in the appropriate + * place. The actual layering will be fixed up when relayer() happens. + */ + void -Playlist::relayer (boost::shared_ptr region) +Playlist::set_layer (boost::shared_ptr region, double new_layer) { - if (_relayer_suspended) { - return; + /* Remove the layer we are setting from our region list, and sort it */ + RegionList copy = regions.rlist(); + copy.remove (region); + copy.sort (RelayerSort ()); + + /* Put region back in the right place */ + RegionList::iterator i = copy.begin(); + while (i != copy.end ()) { + if ((*i)->layer() > new_layer) { + break; + } + ++i; } - RegionList r; - r.push_back (region); - relayer (r); + copy.insert (i, region); + + setup_layering_indices (copy); } -Playlist::TemporaryLayers -Playlist::compute_temporary_layers (RegionList const & relayer_regions) +void +Playlist::setup_layering_indices (RegionList const & regions) const { - TemporaryLayers temporary_layers; - OverlapCache cache (this); - - for (RegionList::const_iterator i = relayer_regions.begin(); i != relayer_regions.end(); ++i) { + uint64_t j = 0; + for (RegionList::const_iterator k = regions.begin(); k != regions.end(); ++k) { + (*k)->set_layering_index (j++); + } +} - DEBUG_TRACE (DEBUG::Layering, string_compose ("Compute temporary layer for %1\n", (*i)->name())); - - /* current_overlaps: regions that overlap *i now */ - RegionList current_overlaps = cache.get ((*i)->bounds ()); - current_overlaps.remove (*i); - DEBUG_TRACE (DEBUG::Layering, "Current overlaps:\n"); - for (RegionList::iterator j = current_overlaps.begin(); j != current_overlaps.end(); ++j) { - DEBUG_TRACE (DEBUG::Layering, string_compose ("\t%1\n", (*j)->name())); - } - - /* overlaps_to_preserve: regions that overlap *i now, but which aren't being - worked on during this relayer: these will have their relationship with - *i preserved. - */ - RegionList overlaps_to_preserve; +/** 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. + */ +void +Playlist::relayer () +{ + /* never compute layers when setting from XML */ - /* overlaps_to_check: regions that overlap *i now, and must be checked to - see if *i is still on the correct layer with respect to them (according - to current layering rules). - */ - RegionList overlaps_to_check; + if (in_set_state) { + return; + } - if (_session.config.get_relayer_on_all_edits () || (*i)->last_layer_op (LayerOpAdd) > (*i)->last_layer_op (LayerOpBoundsChange)) { - /* We're configured to relayer on all edits, or this region has had - no edit since it was added to the playlist, so we're relayering - the whole lot; in this case there are no `overlaps_to_preserve'. - */ - overlaps_to_check = current_overlaps; - } else { - /* We're only relayering new overlaps; find them */ - RegionList last_overlaps = cache.get ((*i)->last_relayer_bounds ()); - last_overlaps.remove (*i); - for (RegionList::const_iterator j = current_overlaps.begin(); j != current_overlaps.end(); ++j) { - if (find (last_overlaps.begin(), last_overlaps.end(), *j) == last_overlaps.end()) { - /* This is a new overlap, which must be checked */ - overlaps_to_check.push_back (*j); - } else { - /* This is an existing overlap, which must be preserved */ - overlaps_to_preserve.push_back (*j); - } - } - } + /* Build up a new list of regions on each layer, stored in a set of lists + each of which represent some period of time on some layer. The idea + is to avoid having to search the entire region list to establish whether + each region overlaps another */ - if (overlaps_to_check.empty ()) { - /* There are no overlaps to check, so just leave everything as it is */ - continue; - } + /* how many pieces to divide this playlist's time up into */ + int const divisions = 512; - DEBUG_TRACE (DEBUG::Layering, "Overlaps to check:\n"); - for (RegionList::iterator j = overlaps_to_check.begin(); j != overlaps_to_check.end(); ++j) { - DEBUG_TRACE (DEBUG::Layering, string_compose ("\t%1\n", (*j)->name())); - } - - /* Put *i on our overlaps_to_check_list */ - overlaps_to_check.push_back (*i); + /* find the start and end positions of the regions on this playlist */ + framepos_t start = INT64_MAX; + framepos_t end = 0; + for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { + start = min (start, (*i)->position()); + end = max (end, (*i)->position() + (*i)->length()); + } - /* And sort it according to the current layer model */ - switch (_session.config.get_layer_model()) { - case LaterHigher: - overlaps_to_check.sort (RegionSortByPosition ()); - break; - case AddOrBoundsChangeHigher: - overlaps_to_check.sort (RegionSortByAddOrBounds ()); - break; - case AddHigher: - overlaps_to_check.sort (RegionSortByAdd ()); - break; - } + /* hence the size of each time division */ + double const division_size = (end - start) / double (divisions); - /* Now find *i in our overlaps_to_check list; within this list it will be in the - right place wrt the current layering rules, so we can work out the layers of the - nearest regions below and above. - */ - double previous_layer = -DBL_MAX; - double next_layer = DBL_MAX; - RegionList::const_iterator j = overlaps_to_check.begin(); - while (*j != *i) { - previous_layer = temporary_layers.get (*j); - ++j; - } + vector > layers; + layers.push_back (vector (divisions)); - /* we must have found *i */ - assert (j != overlaps_to_check.end ()); + /* Sort our regions into layering index order */ + RegionList copy = regions.rlist(); + copy.sort (RelayerSort ()); - ++j; - if (j != overlaps_to_check.end ()) { - next_layer = temporary_layers.get (*j); - } + DEBUG_TRACE (DEBUG::Layering, "relayer() using:\n"); + for (RegionList::iterator i = copy.begin(); i != copy.end(); ++i) { + DEBUG_TRACE (DEBUG::Layering, string_compose ("\t%1 %2\n", (*i)->name(), (*i)->layering_index())); + } - if (next_layer < previous_layer) { - /* If this happens, it means that it's impossible to put *i between overlaps_to_check - in a way that satisfies the current layering rule. So we'll punt and put *i - above previous_layer. - */ - next_layer = DBL_MAX; - } + for (RegionList::iterator i = copy.begin(); i != copy.end(); ++i) { - /* Now we know where *i and overlaps_to_preserve should go: between previous_layer and - next_layer. + /* find the time divisions that this region covers; if there are no regions on the list, + division_size will equal 0 and in this case we'll just say that + start_division = end_division = 0. */ - - DEBUG_TRACE (DEBUG::Layering, string_compose ("%1 and deps need to go between %2 and %3\n", (*i)->name(), previous_layer, next_layer)); - - /* Recurse into overlaps_to_preserve to find dependents */ - RegionList recursed_overlaps_to_preserve; - - for (RegionList::const_iterator k = overlaps_to_preserve.begin(); k != overlaps_to_preserve.end(); ++k) { - recursed_overlaps_to_preserve.push_back (*k); - RegionList touched = recursive_regions_touched (*k, cache, *i); - for (RegionList::iterator m = touched.begin(); m != touched.end(); ++m) { - if (find (recursed_overlaps_to_preserve.begin(), recursed_overlaps_to_preserve.end(), *m) == recursed_overlaps_to_preserve.end()) { - recursed_overlaps_to_preserve.push_back (*m); - } + int start_division = 0; + int end_division = 0; + + if (division_size > 0) { + start_division = floor ( ((*i)->position() - start) / division_size); + end_division = floor ( ((*i)->position() + (*i)->length() - start) / division_size ); + if (end_division == divisions) { + end_division--; } } - /* Put *i into the overlaps_to_preserve list */ - recursed_overlaps_to_preserve.push_back (*i); - - /* Sort it by layer, so that we preserve layering */ - recursed_overlaps_to_preserve.sort (SortByTemporaryLayer (temporary_layers)); - - /* Divide available space up into chunks so that we can relayer everything in that space */ - double const space = (next_layer - previous_layer) / (recursed_overlaps_to_preserve.size() + 1); + assert (divisions == 0 || end_division < divisions); - /* And relayer */ - int m = 1; - for (RegionList::const_iterator k = recursed_overlaps_to_preserve.begin(); k != recursed_overlaps_to_preserve.end(); ++k) { - temporary_layers.set (*k, previous_layer + space * m); - ++m; - } - } - - return temporary_layers; -} - -/** Take a list of temporary layer indices and set up the layers of all regions - * based on them. - */ -void -Playlist::commit_temporary_layers (TemporaryLayers const & temporary_layers) -{ - /* Sort all the playlist's regions by layer, ascending */ - RegionList all_regions = regions.rlist (); - all_regions.sort (SortByTemporaryLayer (temporary_layers)); + /* find the lowest layer that this region can go on */ + size_t j = layers.size(); + while (j > 0) { + /* try layer j - 1; it can go on if it overlaps no other region + that is already on that layer + */ - DEBUG_TRACE (DEBUG::Layering, "Commit layering:\n"); + bool overlap = false; + for (int k = start_division; k <= end_division; ++k) { + RegionList::iterator l = layers[j-1][k].begin (); + while (l != layers[j-1][k].end()) { + if ((*l)->overlap_equivalent (*i)) { + overlap = true; + break; + } + l++; + } - for (RegionList::iterator i = all_regions.begin(); i != all_regions.end(); ++i) { + if (overlap) { + break; + } + } - /* Go through the regions that we have already layered and hence work - out the maximum layer index that is in used at some point during - region *i. - */ - - layer_t max_layer_here = 0; - bool have_overlap = false; - for (RegionList::iterator j = all_regions.begin(); j != i; ++j) { - if ((*j)->overlap_equivalent (*i)) { - max_layer_here = max ((*j)->layer (), max_layer_here); - have_overlap = true; + if (overlap) { + /* overlap, so we must use layer j */ + break; } - } - if (have_overlap) { - /* *i overlaps something, so put it on the next available layer */ - (*i)->set_layer (max_layer_here + 1); - } else { - /* no overlap, so put on the bottom layer */ - (*i)->set_layer (0); + --j; } - - DEBUG_TRACE (DEBUG::Layering, string_compose ("\t%1 temporary %2 committed %3\n", (*i)->name(), temporary_layers.get (*i), (*i)->layer())); - } - notify_layering_changed (); -} + if (j == layers.size()) { + /* we need a new layer for this region */ + layers.push_back (vector (divisions)); + } -/** Relayer a list of regions. - * - * Taking each region R in turn, this method examines the regions O that overlap R in time. - * If the session configuration option "relayer-on-all-moves" is false, we reduce O so that - * it contains only those regions with which new overlaps have been formed since the last - * relayer. - * - * We then change the layer of R and its indirect overlaps so that R meets the current - * Session layer model with respect to O. See doc/layering. - */ + /* put a reference to this region in each of the divisions that it exists in */ + for (int k = start_division; k <= end_division; ++k) { + layers[j][k].push_back (*i); + } -void -Playlist::relayer (RegionList const & relayer_regions) -{ - if (_relayer_suspended) { - return; + (*i)->set_layer (j); } - /* We do this in two parts: first; compute `temporary layer' indices for - regions on the playlist. These are (possibly) fractional indices, which - are a convenient means of working with things when you want to insert layers - between others. + /* It's a little tricky to know when we could avoid calling this; e.g. if we are + relayering because we just removed the only region on the top layer, nothing will + appear to have changed, but the StreamView must still sort itself out. We could + probably keep a note of the top layer last time we relayered, and check that, + but premature optimisation &c... */ + notify_layering_changed (); - TemporaryLayers temporary_layers = compute_temporary_layers (relayer_regions); - - /* Second, we fix up these temporary layers and `commit' them by writing - them to the regions involved. + /* 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 + gone away. */ - - commit_temporary_layers (temporary_layers); -} - -/** Put a region on some fractional layer and sort everything else out around it. - * This can be used to force a region into some layering; for example, calling - * this method with temporary_layer == -0.5 will put the region at the bottom of - * the stack. - */ - -void -Playlist::relayer (boost::shared_ptr region, double temporary_layer) -{ - if (_relayer_suspended) { - return; - } - - TemporaryLayers t; - t.set (region, temporary_layer); - commit_temporary_layers (t); + setup_layering_indices (copy); } void Playlist::raise_region (boost::shared_ptr region) { - relayer (region, region->layer() + 1.5); + set_layer (region, region->layer() + 1.5); + relayer (); } void Playlist::lower_region (boost::shared_ptr region) { - relayer (region, region->layer() - 1.5); + set_layer (region, region->layer() - 1.5); + relayer (); } void Playlist::raise_region_to_top (boost::shared_ptr region) { - relayer (region, max_layer); + set_layer (region, DBL_MAX); + relayer (); } void Playlist::lower_region_to_bottom (boost::shared_ptr region) { - relayer (region, -0.5); + set_layer (region, -0.5); + relayer (); } void @@ -2747,24 +2663,9 @@ Playlist::set_frozen (bool yn) _frozen = yn; } -void -Playlist::timestamp_layer_op (LayerOp op, boost::shared_ptr region) -{ - region->set_last_layer_op (op, ++layer_op_counter); -} - - -/** Find the next or previous region after `region' (next if dir > 0, previous otherwise) - * and swap its position with `region'. - */ void Playlist::shuffle (boost::shared_ptr region, int dir) { - /* As regards layering, the calls we make to set_position() will - perform layering as if the regions had been moved, which I think - is about right. - */ - bool moved = false; if (region->locked()) { @@ -2869,9 +2770,13 @@ Playlist::shuffle (boost::shared_ptr region, int dir) _shuffling = false; if (moved) { + + relayer (); check_dependents (region, false); + notify_contents_changed(); } + } bool @@ -3290,145 +3195,16 @@ Playlist::set_orig_track_id (const PBD::ID& id) _orig_track_id = id; } -/** Set the temporary layer for a region */ -void -Playlist::TemporaryLayers::set (boost::shared_ptr r, double l) -{ - _map[r] = l; -} - -/** Return the temporary layer for a region, if one has been specified - * to this TemporaryLayers object; if not return the region's current - * layer. - */ -double -Playlist::TemporaryLayers::get (boost::shared_ptr r) const +uint64_t +Playlist::highest_layering_index () const { - Map::const_iterator i = _map.find (r); - if (i != _map.end ()) { - return i->second; - } - - return double (r->layer ()); -} - -int const Playlist::OverlapCache::_divisions = 512; - -/** Set up an OverlapCache for a playlist; the cache will only be valid until - * the Playlist is changed. - */ -Playlist::OverlapCache::OverlapCache (Playlist* playlist) - : _range (0, 0) -{ - /* Find the start and end positions of the regions on this playlist */ - _range = Evoral::Range (max_framepos, 0); - RegionList const & rl = playlist->region_list().rlist (); - for (RegionList::const_iterator i = rl.begin(); i != rl.end(); ++i) { - Evoral::Range const b = (*i)->bounds (); - _range.from = min (_range.from, b.from); - _range.to = max (_range.to, b.to); - } - - /* Hence the size of each time divison */ - _division_size = (_range.to - _range.from) / double (_divisions); - - _cache.resize (_divisions); - - /* Build the cache */ - for (RegionList::const_iterator i = rl.begin(); i != rl.end(); ++i) { - pair ind = cache_indices ((*i)->bounds ()); - for (int j = ind.first; j < ind.second; ++j) { - _cache[j].push_back (*i); - } - } -} - -/** @param range Range, in frames. - * @return From and to cache indices for (to is exclusive). - */ -pair -Playlist::OverlapCache::cache_indices (Evoral::Range range) const -{ - range.from = max (range.from, _range.from); - range.to = min (range.to, _range.to); - - pair const p = make_pair ( - floor ((range.from - _range.from) / _division_size), - ceil ((range.to - _range.from) / _division_size) - ); - - assert (p.first >= 0); - assert (p.second <= _divisions); - - return p; -} - -/** Return the regions that overlap a given range. The returned list - * is not guaranteed to be in the same order as the Playlist that it was - * generated from. - */ -Playlist::RegionList -Playlist::OverlapCache::get (Evoral::Range range) const -{ - if (_range.from == max_framepos) { - return RegionList (); - } - - RegionList r; + RegionLock rlock (const_cast (this)); - pair ind = cache_indices (range); - for (int i = ind.first; i < ind.second; ++i) { - for (RegionList::const_iterator j = _cache[i].begin(); j != _cache[i].end(); ++j) { - if ((*j)->coverage (range.from, range.to) != OverlapNone) { - r.push_back (*j); - } - } + uint64_t h = 0; + for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { + h = max (h, (*i)->layering_index ()); } - r.sort (); - r.unique (); - - return r; -} - -void -Playlist::suspend_relayer () -{ - _relayer_suspended = true; -} - -void -Playlist::resume_relayer () -{ - _relayer_suspended = false; -} - -/** Examine a region and return regions which overlap it, and also those which overlap those which overlap etc. - * @param ignore Optional region which should be treated as if it doesn't exist (ie not returned in the list, - * and not recursed into). - */ -Playlist::RegionList -Playlist::recursive_regions_touched (boost::shared_ptr region, OverlapCache const & cache, boost::shared_ptr ignore) const -{ - RegionList touched; - recursive_regions_touched_sub (region, cache, ignore, touched); - - touched.remove (region); - return touched; -} - -/** Recursive sub-routine of recursive_regions_touched */ -void -Playlist::recursive_regions_touched_sub ( - boost::shared_ptr region, OverlapCache const & cache, boost::shared_ptr ignore, RegionList & touched - ) const -{ - RegionList r = cache.get (region->bounds ()); - for (RegionList::iterator i = r.begin(); i != r.end(); ++i) { - if (find (touched.begin(), touched.end(), *i) == touched.end() && *i != ignore) { - touched.push_back (*i); - recursive_regions_touched_sub (*i, cache, ignore, touched); - } - } + return h; }