ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

end drags on regions before doing front trim, so that fades get visually updated rather than skipped because dragging() still returned true

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13657 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-12-13 15:54:50 +00:00
parent faa729afb8
commit 459a943bb0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/editor_drag.cc
View File

@ -1780,6 +1780,10 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred)
if (movement_occurred) { if (movement_occurred) {
motion (event, false); motion (event, false);
for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) {
i->view->drag_end ();
}
/* This must happen before the region's StatefulDiffCommand is created, as it may /* This must happen before the region's StatefulDiffCommand is created, as it may
`correct' (ahem) the region's _start from being negative to being zero. It `correct' (ahem) the region's _start from being negative to being zero. It
needs to be zero in the undo record. needs to be zero in the undo record.
@ -1822,6 +1826,7 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred)
} }
} }
} }
for (set<boost::shared_ptr<Playlist> >::iterator p = _editor->motion_frozen_playlists.begin(); p != _editor->motion_frozen_playlists.end(); ++p) { for (set<boost::shared_ptr<Playlist> >::iterator p = _editor->motion_frozen_playlists.begin(); p != _editor->motion_frozen_playlists.end(); ++p) {
(*p)->thaw (); (*p)->thaw ();
} }
@ -1829,10 +1834,6 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred)
_editor->motion_frozen_playlists.clear (); _editor->motion_frozen_playlists.clear ();
_editor->commit_reversible_command(); _editor->commit_reversible_command();
for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) {
i->view->drag_end ();
}
} else { } else {
/* no mouse movement */ /* no mouse movement */
_editor->point_trim (event, adjusted_current_frame (event)); _editor->point_trim (event, adjusted_current_frame (event));