select all in time range, show object selection while in range mode, trim range ends by a frame when selecting, make things semantically a bit better.

git-svn-id: svn://localhost/trunk/ardour2@329 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 5 insertions, 5 deletions

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 233a8a10b6..64ac0fe7e9 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -481,7 +481,7 @@ Editor::build_range_marker_menu ()
 	items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::marker_menu_remove)));
 
 	items.push_back (SeparatorElem());
-	items.push_back (MenuElem (_("Select all in Range"), mem_fun(*this, &Editor::marker_menu_select_all_from_range)));
+	items.push_back (MenuElem (_("Select all in Range"), mem_fun(*this, &Editor::marker_menu_select_all_selectables_using_range)));
 
 }
 
@@ -529,7 +529,7 @@ Editor::build_transport_marker_menu ()
 	items.push_back (SeparatorElem());
 	items.push_back (MenuElem (_("Hide"), mem_fun(*this, &Editor::marker_menu_hide)));
 	items.push_back (SeparatorElem());
-	items.push_back (MenuElem (_("Select all in Range"), mem_fun(*this, &Editor::marker_menu_select_all_from_range)));
+	items.push_back (MenuElem (_("Select all in Range"), mem_fun(*this, &Editor::marker_menu_select_all_selectables_using_range)));
 }
 
 void
@@ -551,7 +551,7 @@ Editor::marker_menu_hide ()
 }
 
 void
-Editor::marker_menu_select_all_from_range ()
+Editor::marker_menu_select_all_selectables_using_range ()
 {
 	Marker* marker;
 
@@ -559,11 +559,11 @@ Editor::marker_menu_select_all_from_range ()
 		fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
 		/*NOTREACHED*/
 	}
+
 	Location* l;
 	bool is_start;
 
-	if ((l = find_location_from_marker (marker, is_start)) != 0) {
-
+	if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) {
 	        select_all_within (l->start(), l->end(), 0,  DBL_MAX, false);
 	}