From 6a7c5b40a544e40e65f0c5ba412c3aef9c7a1b88 Mon Sep 17 00:00:00 2001 From: GZharun Date: Mon, 29 Sep 2014 16:59:40 +0300 Subject: [PATCH] [Summary] Made cut tool work on a region mouse cursor hovers above even if selected regions are present --- gtk2_ardour/editor.cc | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 6ab9d5e619..97c30c7f6c 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4691,22 +4691,24 @@ Editor::get_regions_from_selection_and_mouse (framepos_t pos) { RegionSelection regions; - if (entered_regionview && selection->tracks.empty() && selection->regions.empty() ) { + regions = selection->regions; + + if (entered_regionview ) { regions.add (entered_regionview); - } else { - regions = selection->regions; - } + } - if ( regions.empty() ) { - TrackViewList tracks = selection->tracks; - - if (!tracks.empty()) { - /* no region selected or entered, but some selected tracks: - * act on all regions on the selected tracks at the edit point - */ - get_regions_at(regions, pos, tracks); - } - } + // Greg Zharun: Waves Tracks PRD does not say this. + // So let's skip this. + //if ( regions.empty() ) { + // TrackViewList tracks = selection->tracks; + // + // if (!tracks.empty()) { + // /* no region selected or entered, but some selected tracks: + // * act on all regions on the selected tracks at the edit point + // */ + // get_regions_at(regions, pos, tracks); + // } + //} return regions; }