X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_selection.cc;h=c598116bade542f3d6acf01f20d831cd7d62062e;hb=8be2e11c653031f2a367cf7c7b6f2320d935684c;hp=6e37868aa3c59acb23751b6457fb2610444fbeb4;hpb=1567d362ad42a8a38b62c03fbf1d2fecdfd0937c;p=ardour.git

diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index 6e37868aa3..c598116bad 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -1521,12 +1521,10 @@ Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
 	list<Selectable *> touched;
 
 	if (after) {
-		begin_reversible_command (_("select all after cursor"));
 		start = cursor->current_frame;
 		end = _session->current_end_frame();
 	} else {
 		if (cursor->current_frame > 0) {
-			begin_reversible_command (_("select all before cursor"));
 			start = 0;
 			end = cursor->current_frame - 1;
 		} else {
@@ -1534,6 +1532,21 @@ Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
 		}
 	}
 
+	if (_internal_editing) {
+		for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+			MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
+			if (mrv) {
+				mrv->select_range (start, end);
+			}
+		}
+		return;
+	}
+
+	if (after) {
+		begin_reversible_command (_("select all after cursor"));
+	} else {
+		begin_reversible_command (_("select all before cursor"));
+	}
 
 	TrackViewList* ts;
 
@@ -1561,12 +1574,10 @@ Editor::select_all_selectables_using_edit (bool after)
 	list<Selectable *> touched;
 
 	if (after) {
-		begin_reversible_command (_("select all after edit"));
 		start = get_preferred_edit_position();
 		end = _session->current_end_frame();
 	} else {
 		if ((end = get_preferred_edit_position()) > 1) {
-			begin_reversible_command (_("select all before edit"));
 			start = 0;
 			end -= 1;
 		} else {
@@ -1574,6 +1585,19 @@ Editor::select_all_selectables_using_edit (bool after)
 		}
 	}
 
+	if (_internal_editing) {
+		for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+			MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
+			mrv->select_range (start, end);
+		}
+		return;
+	}
+
+	if (after) {
+		begin_reversible_command (_("select all after edit"));
+	} else {
+		begin_reversible_command (_("select all before edit"));
+	}
 
 	TrackViewList* ts;
 
@@ -1604,6 +1628,14 @@ Editor::select_all_selectables_between (bool /*within*/)
 		return;
 	}
 
+	if (_internal_editing) {
+		for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+			MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
+			mrv->select_range (start, end);
+		}
+		return;
+	}
+
 	TrackViewList* ts;
 
 	if (selection->tracks.empty()) {