smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 00:34:59 +01:00
Code Issues Projects Releases Wiki Activity

new approach to selections which will help rationalize Split and similar functions. Object and Track selections are now mutually exclusive. a split will happen at (a) selection->regions (b) the intersection of edit_point and selection->tracks or (c) the region under the mouse, IFF nothing else is selected.

Browse source
This commit is contained in:
Ben Loftis 2014-07-05 20:47:43 -05:00
parent 62c3638a42
commit 0b38d65dd0
3 changed files with 53 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

25
gtk2_ardour/editor.cc
View file

@ -4521,22 +4521,14 @@ Editor::get_regions_after (RegionSelection& rs, framepos_t where, const TrackVie
/** Get regions using the following method:
*
* Make a region list using the selected regions, unless
* the edit point is `mouse' and the mouse is over an unselected
* region. In this case, use just that region.
* Make a region list using:
* (a) any selected regions
* (b) the intersection of any selected tracks and the edit point(*)
* (c) if neither exists, and edit_point == mouse, then whatever region is under the mouse
*
* If the edit point is not 'mouse', and there are no regions selected,
* search the list of selected tracks and return regions that are under
* the edit point on these tracks. If there are no selected tracks and
* 'No Selection = All Tracks' is active, search all tracks,
* (*) NOTE: in this case, if 'No Selection = All Tracks' is active, search all tracks
*
* The rationale here is that the mouse edit point is special in that
* its position describes both a time and a track; the other edit
* modes only describe a time. Hence if the edit point is `mouse' we
* ignore selected tracks, as we assume the user means something by
* pointing at a particular track. Also in this case we take note of
* the region directly under the edit point, as there is always just one
* (rather than possibly several with non-mouse edit points).
* Note that we have forced the rule that selected regions and selected tracks are mutually exclusive
*/
RegionSelection
@ -4544,13 +4536,13 @@ Editor::get_regions_from_selection_and_edit_point ()
{
RegionSelection regions;
if (_edit_point == EditAtMouse && entered_regionview && !selection->regions.contains (entered_regionview)) {
if (_edit_point == EditAtMouse && entered_regionview && selection->tracks.empty() && selection->regions.empty() ) {
regions.add (entered_regionview);
} else {
regions = selection->regions;
}
if (regions.empty() && _edit_point != EditAtMouse) {
if ( regions.empty() ) {
TrackViewList tracks = selection->tracks;
if (_route_groups->all_group_active_button().get_active() && tracks.empty()) {
@ -4568,6 +4560,7 @@ Editor::get_regions_from_selection_and_edit_point ()
get_regions_at(regions, where, tracks);
}
}
return regions;
}