diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-02-09 12:43:20 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-02-09 14:46:20 -0500 |
commit | ef79d1c4d4ce45c0ad14b3dcaaff723b5f521aa2 (patch) | |
tree | a0bdfe26d16bef379c183abd49c341b240bbfe53 /gtk2_ardour | |
parent | b2e93b8fbae9c5ac082c40978801f5b7b1087a5c (diff) |
fix last cherry-pick
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/editor_drag.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 13b1e833f9..6239aea24d 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -1053,12 +1053,6 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed return; } - if (_x_constrained) { - _editor->begin_reversible_command (Operations::fixed_time_region_copy); - } else { - _editor->begin_reversible_command (Operations::region_copy); - } - typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping; PlaylistMapping playlist_mapping; @@ -1148,18 +1142,9 @@ RegionMoveDrag::finished_no_copy ( return; } -<<<<<<< HEAD -======= - if (_x_constrained) { - _editor->begin_reversible_command (_("fixed time region drag")); - } else { - _editor->begin_reversible_command (Operations::region_drag); - } - typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping; PlaylistMapping playlist_mapping; ->>>>>>> 1faf1a1... After dragging from multiple tracks to the dropzone, create the right number of new tracks. for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ) { RegionView* rv = i->view; |