allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Revert "Paste Mode: overwrite-paste, naive implementation using rec-mode (for testing)"

Browse Source 
This reverts commit f4d4dddbeb.

Deferred until after Ardour 6.8
This commit is contained in:
Paul Davis
2021-07-01 18:28:04 -06:00
parent 88e0b24163
commit 1734fac410
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor_ops.cc
View File

@@ -2621,7 +2621,7 @@ Editor::insert_source_list_selection (float times)
begin_reversible_command (_("insert region"));
playlist->clear_changes ();
playlist->clear_owned_changes ();
playlist->add_region ((RegionFactory::create (region, true)), get_preferred_edit_position(), times, _session->config.get_layered_record_mode()); //ToDo: insert_mode ?
playlist->add_region ((RegionFactory::create (region, true)), get_preferred_edit_position(), times);
if (Config->get_edit_mode() == Ripple) {
playlist->ripple (get_preferred_edit_position(), region->length() * times, boost::shared_ptr<Region>());
/* recusive diff of rippled regions */

9
libs/ardour/playlist.cc
View File

@@ -1296,15 +1296,6 @@ Playlist::paste (boost::shared_ptr<Playlist> other, samplepos_t position, float
{
times = fabs (times);
if (times==1 && _session.config.get_layered_record_mode()) { //ToDo: insert_mode?
RegionWriteLock rlock (this);
samplepos_t pos = position;
partition_internal (pos - 1, (pos + other->_get_extent ().second), true, rlock.thawlist);
for (RegionList::iterator i = rlock.thawlist.begin (); i != rlock.thawlist.end (); ++i) {
_session.add_command (new StatefulDiffCommand (*i));
}
}
{
RegionReadLock rl2 (other.get ());