diff options
author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2013-04-03 16:54:32 +0100 |
---|---|---|
committer | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2013-04-03 17:04:04 +0100 |
commit | f4a9c02b1dccae504ea47aa655a1a9f7bf690505 (patch) | |
tree | 462076b8381f63b3f3bb0d65d262508ea9a1b372 | |
parent | ec6dd2dc8bff2c5c3058ce72f45d4585a0d0ff30 (diff) |
Use selection->regions instead of Editor::get_regions_from_selection()
Remove Editor::get_regions_from_selection(), and use selection->regions
directly in the few places it was called.
-rw-r--r-- | gtk2_ardour/editor.cc | 11 | ||||
-rw-r--r-- | gtk2_ardour/editor.h | 1 | ||||
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/rhythm_ferret.cc | 2 |
4 files changed, 2 insertions, 14 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 4f3390e752..94e69a6968 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4588,17 +4588,6 @@ 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 diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 8ecd5cc07d..6155dea745 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -2042,7 +2042,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void get_regions_at (RegionSelection&, framepos_t where, const TrackViewList& ts) const; void get_regions_after (RegionSelection&, framepos_t where, const TrackViewList& ts) const; - RegionSelection get_regions_from_selection (); RegionSelection get_regions_from_selection_and_edit_point (); RegionSelection get_regions_from_selection_and_entered (); diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 415614b811..9797c0ef7e 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -3737,7 +3737,7 @@ Editor::cut_copy (CutCopyOp op) /* we only want to cut regions if some are selected */ if (!selection->regions.empty()) { - rs = get_regions_from_selection (); + rs = selection->regions; } switch (effective_mouse_mode()) { diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc index bad603b030..5a59b5ce5d 100644 --- a/gtk2_ardour/rhythm_ferret.cc +++ b/gtk2_ardour/rhythm_ferret.cc @@ -345,7 +345,7 @@ RhythmFerret::do_split_action () performed on the selection only (without entered_regionview or the edit point being considered) */ - RegionSelection regions = editor.get_regions_from_selection(); + RegionSelection regions = editor.selection->regions; if (regions.empty()) { return; |