diff options
author | Carl Hetherington <carl@carlh.net> | 2010-12-07 19:55:43 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-12-07 19:55:43 +0000 |
commit | 56554af08f7a54e0415bc3fff4752ca141e56498 (patch) | |
tree | 97e4d708ff33f72cbdba8279fb20387e27de5f46 /gtk2_ardour | |
parent | f3fc6195bc6136a31b08ffe8c260a64efe77f9dc (diff) |
Revert previous ill-thought-out patch.
git-svn-id: svn://localhost/ardour2/branches/3.0@8213 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/editor_drag.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/midi_region_view.cc | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index daebea1cfe..fb3ef58802 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -1533,7 +1533,6 @@ TrimDrag::start_grab (GdkEvent* event, Gdk::Cursor*) framepos_t const pf = adjusted_current_frame (event); if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { - /* Move the contents of the region around without changing the region bounds */ _operation = ContentsTrim; Drag::start_grab (event, _editor->cursors()->trimmer); } else { @@ -1724,7 +1723,6 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred) if (_operation == StartTrim) { i->view->trim_front_ending (); } - i->view->region()->resume_property_changes (); } } diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 40dbd15037..cdfc1cbc3a 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -3246,9 +3246,4 @@ MidiRegionView::trim_front_ending () _note_group->reparent (*group); delete _temporary_note_group; _temporary_note_group = 0; - - if (_region->start() < 0) { - /* Trim drag made start time -ve; fix this */ - midi_region()->fix_negative_start (); - } } |