diff options
Diffstat (limited to 'gtk2_ardour/editor_mouse.cc')
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 63 |
1 files changed, 43 insertions, 20 deletions
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 1a9e1161c2..5a25c2e4b8 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1620,7 +1620,6 @@ Editor::end_grab (ArdourCanvas::Item* item, GdkEvent* event) stop_canvas_autoscroll (); if (drag_info.item == 0) { - cerr << "end grab with no item\n"; return false; } @@ -2768,7 +2767,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event) drag_info.want_move_threshold = false; // don't copy again /* duplicate the region(s) */ - + vector<RegionView*> new_regionviews; for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) { @@ -2801,7 +2800,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event) /* reset drag_info data to reflect the fact that we are dragging the copies */ drag_info.data = new_regionviews.front(); - + swap_grab (new_regionviews.front()->get_canvas_group (), 0, event->motion.time); } @@ -3234,6 +3233,7 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event RouteTimeAxisView* atv; bool regionview_y_movement; bool regionview_x_movement; + vector<RegionView*> copies; /* first_move is set to false if the regionview has been moved in the motion handler. @@ -3241,6 +3241,12 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event if (drag_info.first_move) { /* just a click */ + + if (drag_info.copy) { + for (list<RegionView*>::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + copies.push_back (*i); + } + } goto out; } @@ -3254,6 +3260,13 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event if (drag_info.brushing) { /* all changes were made during motion event handlers */ + + if (drag_info.copy) { + for (list<RegionView*>::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + copies.push_back (*i); + } + } + goto out; } @@ -3296,7 +3309,7 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event vector<RegionView*> new_selection; for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ) { - + RegionView* rv = (*i); double ix1, ix2, iy1, iy2; @@ -3332,6 +3345,12 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event session->add_command (new MementoCommand<Playlist>(*from_playlist, &from_playlist->get_state(), 0)); from_playlist->remove_region ((rv->region())); session->add_command (new MementoCommand<Playlist>(*from_playlist, 0, &from_playlist->get_state())); + + } else { + + /* the regionview we dragged around is a temporary copy, queue it for deletion */ + + copies.push_back (rv); } latest_regionview = 0; @@ -3346,11 +3365,6 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event new_selection.push_back (latest_regionview); } - if (drag_info.copy) { - // get rid of the copy - delete rv; - } - /* OK, this is where it gets tricky. If the playlist was being used by >1 tracks, and the region was selected in all of them, then removing it from the playlist will have removed all trace of it from the selection (i.e. there were N regions selected, we removed 1, @@ -3363,12 +3377,19 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event here. if the region selection is not empty, then restart the loop because we know that we must have removed at least the region(view) we've just been working on as well as any that we processed on previous iterations. + + EXCEPT .... if we are doing a copy drag, then the selection hasn't been modified and + we can just iterate. */ - if (selection->regions.empty()) { - break; - } else { - i = selection->regions.by_layer().begin(); + if (drag_info.copy) { + ++i; + } else { + if (selection->regions.empty()) { + break; + } else { + i = selection->regions.by_layer().begin(); + } } } @@ -3462,10 +3483,8 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event session->add_command (new MementoCommand<Playlist>(*to_playlist, 0, &to_playlist->get_state())); - /* get rid of the copy */ - if (drag_info.copy) { - delete rv; + copies.push_back (rv); } } } @@ -3475,6 +3494,10 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event if (!nocommit) { commit_reversible_command (); } + + for (vector<RegionView*>::iterator x = copies.begin(); x != copies.end(); ++x) { + delete *x; + } } void @@ -4521,7 +4544,7 @@ Editor::end_range_markerbar_op (ArdourCanvas::Item* item, GdkEvent* event) switch (mouse_mode) { case MouseObject: /* find the two markers on either side and then make the selection from it */ - select_all_within (start, end, 0.0f, FLT_MAX, Selection::Set); + select_all_within (start, end, 0.0f, FLT_MAX, track_views, Selection::Set); break; case MouseRange: @@ -4724,9 +4747,9 @@ Editor::end_rubberband_select (ArdourCanvas::Item* item, GdkEvent* event) begin_reversible_command (_("rubberband selection")); if (drag_info.grab_frame < drag_info.last_pointer_frame) { - commit = select_all_within (drag_info.grab_frame, drag_info.last_pointer_frame, y1, y2, op); + commit = select_all_within (drag_info.grab_frame, drag_info.last_pointer_frame, y1, y2, track_views, op); } else { - commit = select_all_within (drag_info.last_pointer_frame, drag_info.grab_frame, y1, y2, op); + commit = select_all_within (drag_info.last_pointer_frame, drag_info.grab_frame, y1, y2, track_views, op); } if (commit) { @@ -4761,7 +4784,7 @@ Editor::mouse_rename_region (ArdourCanvas::Item* item, GdkEvent* event) string str; prompter.get_result(str); if (str.length()) { - clicked_regionview->region()->set_name (str); + clicked_regionview->region()->set_name (str); } break; } |