add nascent poly-phonic pressure to automation menu for MIDI tracks

[ardour.git] / gtk2_ardour / editor_selection.cc

diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index 3c731f5ccbf09f999837aa3ba1358f53a431cedf..f2681b58e25e5ea32379c95a02314a26f05e1278 100644 (file)
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -43,7 +43,7 @@
 #include "midi_region_view.h"
 #include "sfdb_ui.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -621,7 +621,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
                                if (press) {
 
                                        if (selection->selected (clicked_routeview)) {
-                                               get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id);
+                                               get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::group_select.property_id);
                                        } else {
                                                all_equivalent_regions.push_back (clicked_regionview);
                                        }
@@ -639,7 +639,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
 
                case Selection::Set:
                        if (!selection->selected (clicked_regionview)) {
-                               get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id);
+                               get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::group_select.property_id);
                                selection->set (all_equivalent_regions);
                                commit = true;
                        } else {
@@ -649,7 +649,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
                                else {
                                        if (selection->regions.size() > 1) {
                                                /* collapse region selection down to just this one region (and its equivalents) */
-                                               get_equivalent_regions(clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id);
+                                               get_equivalent_regions(clicked_regionview, all_equivalent_regions, ARDOUR::Properties::group_select.property_id);
                                                selection->set(all_equivalent_regions);
                                                commit = true;
                                        }
@@ -879,7 +879,12 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
                if (!regions.empty()) {
                        selection->add (regions);
                        commit = true;
+               } else if (selection->regions.empty() && !selection->selected (clicked_regionview)) {
+                       /* ensure that at least the clicked regionview is selected. */
+                       selection->set (clicked_regionview);
+                       commit = true;
                }
+
        }
 
 out:
@@ -1088,7 +1093,6 @@ Editor::sensitize_all_region_actions (bool s)
 void
 Editor::sensitize_the_right_region_actions ()
 {
-
        RegionSelection rs = get_regions_from_selection_and_entered ();
        sensitize_all_region_actions (!rs.empty ());
 
@@ -1373,11 +1377,15 @@ Editor::region_selection_changed ()
        _regions->block_change_connection (false);
        editor_regions_selection_changed_connection.block(false);
 
-       if (!_all_region_actions_sensitized) {
-               /* This selection change might have changed what region actions
-                  are allowed, so sensitize them all in case a key is pressed.
-               */
-               sensitize_all_region_actions (true);
+       if (selection->regions.empty()) {
+               sensitize_all_region_actions (false);
+       } else {
+               if (!_all_region_actions_sensitized) {
+                       /* This selection change might have changed what region actions
+                          are allowed, so sensitize them all in case a key is pressed.
+                       */
+                       sensitize_all_region_actions (true);
+               }
        }
 
        if (_session && !_session->transport_rolling() && !selection->regions.empty()) {
@@ -1566,7 +1574,7 @@ Editor::select_all_within (framepos_t start, framepos_t end, double top, double
 
        if (preserve_if_selected && op != Selection::Toggle) {
                list<Selectable*>::iterator i = found.begin();
-               while (i != found.end() && (*i)->get_selected()) {
+               while (i != found.end() && (*i)->selected()) {
                        ++i;
                }