diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 02b9e25157..c521e52880 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -368,7 +368,6 @@ protected: bool in_undo; bool first_set_state; bool _hidden; - bool _splicing; bool _rippling; bool _shuffling; bool _nudging; @@ -418,11 +417,6 @@ protected: void sort_regions (); - void possibly_splice (samplepos_t at, samplecnt_t distance, boost::shared_ptr exclude = boost::shared_ptr ()); - void possibly_splice_unlocked (samplepos_t at, samplecnt_t distance, boost::shared_ptr exclude, ThawList& thawlist); - - void splice_locked (samplepos_t at, samplecnt_t distance, boost::shared_ptr exclude); - void splice_unlocked (samplepos_t at, samplecnt_t distance, boost::shared_ptr exclude, ThawList& thawlist); void ripple_locked (samplepos_t at, samplecnt_t distance, RegionList* exclude); bool ripple_unlocked (samplepos_t at, samplecnt_t distance, RegionList* exclude, ThawList& thawlist); diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index 2caec5bc71..42a43f1804 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -223,10 +223,6 @@ MidiPlaylist::_split_region (boost::shared_ptr region, const MusicSample MusicSample before (playlist_position.sample - region->position(), playlist_position.division); MusicSample after (region->length() - before.sample, playlist_position.division); - /* split doesn't change anything about length, so don't try to splice */ - bool old_sp = _splicing; - _splicing = true; - RegionFactory::region_name (before_name, region->name(), false); { @@ -266,8 +262,6 @@ MidiPlaylist::_split_region (boost::shared_ptr region, const MusicSample add_region_internal (right, region->position() + before.sample, thawlist, before.division, region->quarter_note() + before_qn, true); remove_region_internal (region, thawlist); - - _splicing = old_sp; } set diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 2224bfd997..c5b37db283 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -191,7 +191,6 @@ Playlist::Playlist (boost::shared_ptr other, string namestr, boo in_set_state--; - _splicing = other->_splicing; _rippling = other->_rippling; _nudging = other->_nudging; @@ -344,7 +343,6 @@ Playlist::init (bool hide) first_set_state = true; _refcnt = 0; _hidden = hide; - _splicing = false; _rippling = false; _shuffling = false; _nudging = false; @@ -746,8 +744,6 @@ Playlist::add_region (boost::shared_ptr region, samplepos_t position, fl set_layer (sub, DBL_MAX); } } - - possibly_splice_unlocked (position, (pos + length) - position, region, rlock.thawlist); } void @@ -789,8 +785,6 @@ Playlist::add_region_internal (boost::shared_ptr region, samplepos_t pos regions.insert (upper_bound (regions.begin (), regions.end (), region, cmp), region); all_regions.insert (region); - possibly_splice_unlocked (position, region->length (), region, thawlist); - if (!holding_state ()) { /* layers get assigned from XML state, and are not reset during undo/redo */ relayer (); @@ -817,16 +811,9 @@ Playlist::replace_region (boost::shared_ptr old, boost::shared_ptrlayer ()); - - _splicing = old_sp; - - possibly_splice_unlocked (pos, old->length () - newr->length (), boost::shared_ptr (), rlock.thawlist); } void @@ -855,8 +842,6 @@ Playlist::remove_region_internal (boost::shared_ptr region, ThawList& th regions.erase (i); - possibly_splice_unlocked (pos, -distance, boost::shared_ptr (), thawlist); - if (!holding_state ()) { relayer (); remove_dependents (region); @@ -1521,11 +1506,6 @@ Playlist::_split_region (boost::shared_ptr region, const MusicSample& pl string before_name; string after_name; - /* split doesn't change anything about length, so don't try to splice */ - - bool old_sp = _splicing; - _splicing = true; - RegionFactory::region_name (before_name, region->name (), false); { @@ -1563,8 +1543,6 @@ Playlist::_split_region (boost::shared_ptr region, const MusicSample& pl add_region_internal (right, region->position () + before.sample, thawlist, before.division); remove_region_internal (region, thawlist); - - _splicing = old_sp; } void @@ -1657,7 +1635,7 @@ Playlist::ripple_unlocked (samplepos_t at, samplecnt_t distance, RegionList* exc void Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shared_ptr region) { - if (in_set_state || _splicing || _rippling || _nudging || _shuffling) { + if (in_set_state || _rippling || _nudging || _shuffling) { return; } @@ -1693,10 +1671,6 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar delta += region->length () - region->last_length (); } - if (delta) { - possibly_splice (region->last_position () + region->last_length (), delta, region); - } - if (holding_state ()) { pending_bounds.push_back (region); } else { @@ -1748,7 +1722,7 @@ Playlist::region_changed (const PropertyChange& what_changed, boost::shared_ptr< if (what_changed.contains (bounds)) { region_bounds_changed (what_changed, region); - save = !(_splicing || _nudging); + save = !_nudging; send_contents = true; }