smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 03:36:32 +01:00
Code Issues Projects Releases Wiki Activity

stop using ripple callback API, add Editor::should_ripple() and Editor::do_ripple() to manage rippling

Browse source
This commit is contained in:
Paul Davis 2021-06-02 16:34:13 -06:00
parent a2b3e31e10
commit 636f1331e8
7 changed files with 119 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gtk2_ardour/editor_drag.cc
View file

@ -2184,12 +2184,12 @@ RegionInsertDrag::finished (GdkEvent * event, bool)
playlist->add_region (_primary->region (), _last_position.sample, 1.0, false, _last_position.division);
if (Config->get_edit_mode() == Ripple) {
playlist->ripple (_last_position.sample, _primary->region()->length(), _primary->region(), _editor->ripple_callback (true));
if (_editor->should_ripple()) {
_editor->do_ripple (playlist,_last_position.sample, _primary->region()->length(), _primary->region(), true);
} else {
playlist->rdiff_and_add_command (_editor->session());
}
playlist->rdiff_and_add_command (_editor->session());
_editor->commit_reversible_command ();
delete _primary;
@ -2486,7 +2486,7 @@ RegionRippleDrag::motion (GdkEvent* event, bool first_move)
remove_unselected_from_views (prev_amount, false);
// ripple previous playlist according to the regions that have been removed onto the new playlist
prev_tav->playlist()->ripple(prev_position, -selection_length, exclude, _editor->ripple_callback (false));
prev_tav->playlist()->ripple(prev_position, -selection_length, exclude);
prev_amount = 0;
// move just the selected regions
@ -2495,7 +2495,7 @@ RegionRippleDrag::motion (GdkEvent* event, bool first_move)
// ensure that the ripple operation on the new playlist inserts selection_length time
adjust = selection_length;
// ripple the new current playlist
tv->playlist()->ripple (where, amount+adjust, exclude, _editor->ripple_callback (false));
tv->playlist()->ripple (where, amount+adjust, exclude);
// add regions after point where drag entered this track to subsequent ripples
add_all_after_to_views (tv, where, _editor->selection->regions, true);