diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-05 17:16:33 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-05 17:16:33 -0400 |
commit | 8eef4b1904bcc611f5f4230927ca9eda2352d36b (patch) | |
tree | e004392027fb0208091ffb60baaa597a6d4a95b8 /gtk2_ardour/editor.cc | |
parent | 07a505b1b271f64a1ffb2da32da0548d32cd13de (diff) |
master merge; new files not added after initial cairocanvas patch application
Diffstat (limited to 'gtk2_ardour/editor.cc')
-rw-r--r-- | gtk2_ardour/editor.cc | 85 |
1 files changed, 23 insertions, 62 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index bde5b65893..194c344241 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4040,7 +4040,7 @@ Editor::restore_editing_space () /** * Make new playlists for a given track and also any others that belong - * to the same active route group with the `edit' property. + * to the same active route group with the `select' property. * @param v Track. */ @@ -4056,7 +4056,7 @@ Editor::new_playlists (TimeAxisView* v) /** * Use a copy of the current playlist for a given track and also any others that belong - * to the same active route group with the `edit' property. + * to the same active route group with the `select' property. * @param v Track. */ @@ -4071,7 +4071,7 @@ Editor::copy_playlists (TimeAxisView* v) } /** Clear the current playlist for a given track and also any others that belong - * to the same active route group with the `edit' property. + * to the same active route group with the `select' property. * @param v Track. */ @@ -4592,32 +4592,16 @@ Editor::get_regions_after (RegionSelection& rs, framepos_t where, const TrackVie } } -/** Start with regions that are selected. Then add equivalent regions - * on tracks in the same active edit-enabled route group as any of - * the regions that we started with. - */ - -RegionSelection -Editor::get_regions_from_selection () -{ - return get_equivalent_regions (selection->regions, ARDOUR::Properties::select.property_id); -} - /** Get regions using the following method: * - * Make an initial region list using the selected regions, unless + * 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, start with just that region. - * - * Then, add equivalent regions in active edit groups to the region list. - * - * Then, search the list of selected tracks to find any selected tracks which - * do not contain regions already in the region list. If there are no selected - * tracks and 'No Selection = All Tracks' is active, search all tracks rather - * than just the selected. + * region. In this case, use just that region. * - * Add any regions that are under the edit point on these tracks to get the - * returned region list. + * 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, * * 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 @@ -4639,48 +4623,25 @@ Editor::get_regions_from_selection_and_edit_point () regions = selection->regions; } - TrackViewList tracks; - if (_edit_point != EditAtMouse) { - tracks = selection->tracks; - } + if (regions.empty() && _edit_point != EditAtMouse) { + TrackViewList tracks = selection->tracks; - /* Add any other regions that are in the same - edit-activated route group as one of our regions. - */ - regions = get_equivalent_regions (regions, ARDOUR::Properties::select.property_id); - framepos_t const where = get_preferred_edit_position (); - - if (_route_groups->all_group_active_button().get_active() && tracks.empty()) { - /* tracks is empty (no track selected), and 'No Selection = All Tracks' - * is enabled, so consider all tracks - */ - tracks = track_views; - } - - if (!tracks.empty()) { - /* now search the selected tracks for tracks which don't - already contain regions to be acted upon, and get regions at - the edit point on those tracks too. - */ - TrackViewList tracks_without_relevant_regions; - - for (TrackViewList::iterator t = tracks.begin (); t != tracks.end (); ++t) { - if (!regions.involves (**t)) { - /* there are no equivalent regions on this track */ - tracks_without_relevant_regions.push_back (*t); - } + if (_route_groups->all_group_active_button().get_active() && tracks.empty()) { + /* tracks is empty (no track selected), and 'No Selection = All Tracks' + * is enabled, so consider all tracks + */ + tracks = track_views; } - if (!tracks_without_relevant_regions.empty()) { - /* there are some selected tracks with neither selected - * regions or their equivalents: act upon all regions in - * those tracks - */ - get_regions_at (regions, where, tracks_without_relevant_regions); + if (!tracks.empty()) { + /* no region selected or entered, but some selected tracks: + * act on all regions on the selected tracks at the edit point + */ + framepos_t const where = get_preferred_edit_position (); + get_regions_at(regions, where, tracks); } } - return regions; } @@ -4698,7 +4659,7 @@ Editor::get_regions_from_selection_and_entered () regions.add (entered_regionview); } - return get_equivalent_regions (regions, ARDOUR::Properties::select.property_id); + return regions; } void |