smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

manual fixups for rebase-on-master issues

Browse source
This commit is contained in:
Paul Davis 2021-06-18 13:54:44 -06:00
parent a95b1d2cd1
commit 311db08cc3
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/editor_drag.cc
View file

@ -840,7 +840,7 @@ RegionMotionDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
_ignore_video_lock = true; _ignore_video_lock = true;
} }
if (_brushing || _editor->should_ripple()) { if (_editor->should_ripple()) {
/* we do not drag across tracks when rippling or brushing */ /* we do not drag across tracks when rippling or brushing */
_y_constrained = true; _y_constrained = true;
} }
@ -1515,7 +1515,7 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move)
void void
RegionMoveDrag::motion (GdkEvent* event, bool first_move) 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 (); collect_ripple_views ();
} }
@ -1835,7 +1835,7 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const changed_t
clear_draggingview_list(); clear_draggingview_list();
for (PlaylistSet::iterator p = modified_playlists.begin(); p != modified_playlists.end(); ++p) { 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)->ripple (extent_min, extent_max - extent_min, &ripple_exclude);
} }
(*p)->rdiff_and_add_command (_editor->session()); (*p)->rdiff_and_add_command (_editor->session());

15
gtk2_ardour/editor_mouse.cc
View file

@ -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())); _drags->add (new RegionSlipContentsDrag (this, item, clicked_regionview, selection->regions.by_layer()));
} }
} else if (ArdourKeyboard::indicates_copy (event->button.state)) { } 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)) { } else if (Keyboard::the_keyboard().key_is_down (GDK_b)) {
add_region_brush_drag (item, event, clicked_regionview); add_region_brush_drag (item, event, clicked_regionview);
} else { } else {
@ -2579,17 +2579,12 @@ Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region
return; return;
} }
switch (Config->get_edit_mode()) { if (Config->get_edit_mode() == Lock) {
case Lock:
return; 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 void