smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-05 21:25:46 +01:00
Code Issues Projects Releases Wiki Activity

Anywhere that deletes regions needs to use a rdiff() on the playlist

Browse source 
for the undo history, so that changes to regions' layering_index
get stored in the undo record.  Make Playlist::update use add_region_internal
so that undone regions don't have their layering_index corrupted.
Setup layering indices on relayer() so that deletion of regions
causes an update.


git-svn-id: svn://localhost/ardour2/branches/3.0@11123 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-12-30 23:41:17 +00:00
parent 0be530821c
commit b93254f275
3 changed files with 63 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/ardour/playlist.h
View file

@ -378,6 +378,10 @@ public:
with its constituent regions
*/
virtual void pre_uncombine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>) {}
private:
void setup_layering_indices (RegionList const &) const;
};
} /* namespace ARDOUR */

19
libs/ardour/playlist.cc
View file

@ -653,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> region, framepos_t position, float times, bool auto_partition)
{
@ -2097,7 +2098,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) {
@ -2371,13 +2372,19 @@ Playlist::set_layer (boost::shared_ptr<Region> region, double new_layer)
copy.insert (i, region);
/* Then re-write layering indices */
setup_layering_indices (copy);
}
void
Playlist::setup_layering_indices (RegionList const & regions) const
{
uint64_t j = 0;
for (RegionList::iterator k = copy.begin(); k != copy.end(); ++k) {
for (RegionList::const_iterator k = regions.begin(); k != regions.end(); ++k) {
(*k)->set_layering_index (j++);
}
}
/** 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.
*/
@ -2493,6 +2500,12 @@ Playlist::relayer ()
if (changed) {
notify_layering_changed ();
}
/* 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.
*/
setup_layering_indices (copy);
}
void