ardour/livetrax
13
0
Fork 0
Code

fix last cherry-pick

Browse Source
This commit is contained in:
Paul Davis 2015-02-09 12:43:20 -05:00
parent b2e93b8fba
commit ef79d1c4d4
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk2_ardour/editor_drag.cc
View File

@ -1053,12 +1053,6 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed
return; 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; typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping;
PlaylistMapping playlist_mapping; PlaylistMapping playlist_mapping;
@ -1148,18 +1142,9 @@ RegionMoveDrag::finished_no_copy (
return; 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; typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping;
PlaylistMapping playlist_mapping; 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(); ) { for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ) {
RegionView* rv = i->view; RegionView* rv = i->view;