From 311db08cc3c3fc632a13c8f1718716a4277d78fa Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 18 Jun 2021 13:54:44 -0600 Subject: [PATCH] manual fixups for rebase-on-master issues --- gtk2_ardour/editor_drag.cc | 6 +++--- gtk2_ardour/editor_mouse.cc | 15 +++++---------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 06f6362bc7..855d87469f 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -840,7 +840,7 @@ RegionMotionDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) _ignore_video_lock = true; } - if (_brushing || _editor->should_ripple()) { + if (_editor->should_ripple()) { /* we do not drag across tracks when rippling or brushing */ _y_constrained = true; } @@ -1515,7 +1515,7 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) void RegionMoveDrag::motion (GdkEvent* event, bool first_move) { - if (first_move && _editor->should_ripple() && !_copy && !_brushing) { + if (first_move && _editor->should_ripple() && !_copy) { collect_ripple_views (); } @@ -1835,7 +1835,7 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const changed_t clear_draggingview_list(); for (PlaylistSet::iterator p = modified_playlists.begin(); p != modified_playlists.end(); ++p) { - if (!_brushing && _editor->should_ripple()) { + if (_editor->should_ripple()) { (*p)->ripple (extent_min, extent_max - extent_min, &ripple_exclude); } (*p)->rdiff_and_add_command (_editor->session()); diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index fbff72a574..374cd09e76 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1067,7 +1067,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT _drags->add (new RegionSlipContentsDrag (this, item, clicked_regionview, selection->regions.by_layer())); } } else if (ArdourKeyboard::indicates_copy (event->button.state)) { - add_region_copy_drag (item, event, clicked_regionview, true); + add_region_drag (item, event, clicked_regionview, true); } else if (Keyboard::the_keyboard().key_is_down (GDK_b)) { add_region_brush_drag (item, event, clicked_regionview); } else { @@ -2579,17 +2579,12 @@ Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region return; } - switch (Config->get_edit_mode()) { - case Lock: + if (Config->get_edit_mode() == Lock) { return; - case Ripple: - case RippleAll: - _drags->add (new RegionRippleDrag (this, item, region_view, selection->regions.by_layer(), false)); - break; - default: - _drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), false, copy)); - break; } + + _drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), copy)); + } void