diff options
| -rw-r--r-- | gtk2_ardour/editor.h | 6 | ||||
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 7 | ||||
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 17 |
3 files changed, 9 insertions, 21 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 8022fff2a3..aa8f8579ee 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1675,9 +1675,9 @@ public: /* trimming */ void point_trim (GdkEvent *, nframes64_t); - void single_contents_trim (RegionView&, nframes64_t, bool, bool, bool); - void single_start_trim (RegionView&, nframes64_t, bool, bool, bool); - void single_end_trim (RegionView&, nframes64_t, bool, bool, bool); + void single_contents_trim (RegionView&, nframes64_t, bool, bool); + void single_start_trim (RegionView&, nframes64_t, bool, bool); + void single_end_trim (RegionView&, nframes64_t, bool, bool); void thaw_region_after_trim (RegionView& rv); diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index a4f402ba2c..9885ea9776 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -1739,7 +1739,6 @@ TrimDrag::motion (GdkEvent* event, bool first_move) nframes64_t frame_delta = 0; bool left_direction; - bool obey_snap = event ? !Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier()) : false; /* snap modifier works differently here.. its current state has to be passed to the @@ -1822,7 +1821,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move) } else { for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) { - _editor->single_start_trim (*i->view, frame_delta, left_direction, obey_snap, non_overlap_trim); + _editor->single_start_trim (*i->view, frame_delta, left_direction, non_overlap_trim); } break; } @@ -1833,7 +1832,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move) } else { for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) { - _editor->single_end_trim (*i->view, frame_delta, left_direction, obey_snap, non_overlap_trim); + _editor->single_end_trim (*i->view, frame_delta, left_direction, non_overlap_trim); } break; } @@ -1847,7 +1846,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move) } for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) { - _editor->single_contents_trim (*i->view, frame_delta, left_direction, swap_direction, obey_snap); + _editor->single_contents_trim (*i->view, frame_delta, left_direction, swap_direction); } } break; diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index b7357cd53a..197121eb06 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -2119,7 +2119,7 @@ Editor::cancel_selection () void -Editor::single_contents_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool swap_direction, bool obey_snap) +Editor::single_contents_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool swap_direction) { boost::shared_ptr<Region> region (rv.region()); @@ -2151,15 +2151,12 @@ Editor::single_contents_trim (RegionView& rv, nframes64_t frame_delta, bool left } } - if (obey_snap) { - snap_to (new_bound); - } region->trim_start ((nframes64_t) (new_bound * speed), this); rv.region_changed (PropertyChange (ARDOUR::Properties::start)); } void -Editor::single_start_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool obey_snap, bool no_overlap) +Editor::single_start_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool no_overlap) { boost::shared_ptr<Region> region (rv.region()); @@ -2183,10 +2180,6 @@ Editor::single_start_trim (RegionView& rv, nframes64_t frame_delta, bool left_di new_bound = (nframes64_t) (region->position()/speed) + frame_delta; } - if (obey_snap) { - snap_to (new_bound, (left_direction ? 0 : 1)); - } - nframes64_t pre_trim_first_frame = region->first_frame(); region->trim_front ((nframes64_t) (new_bound * speed), this); @@ -2214,7 +2207,7 @@ Editor::single_start_trim (RegionView& rv, nframes64_t frame_delta, bool left_di } void -Editor::single_end_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool obey_snap, bool no_overlap) +Editor::single_end_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool no_overlap) { boost::shared_ptr<Region> region (rv.region()); @@ -2238,10 +2231,6 @@ Editor::single_end_trim (RegionView& rv, nframes64_t frame_delta, bool left_dire new_bound = (nframes64_t) ((region->last_frame() + 1)/speed) + frame_delta; } - if (obey_snap) { - snap_to (new_bound); - } - nframes64_t pre_trim_last_frame = region->last_frame(); region->trim_end ((nframes64_t) (new_bound * speed), this); |