make click on empty canvas area clear selection; change zoom-ot-region to be a toggle; fixup naming of audition-selection/play-selected-region

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2789 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 13 insertions, 16 deletions

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 2107d3718e..f3a493e195 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1588,6 +1588,17 @@ Editor::temporal_zoom_region ()
 	}
 
 	temporal_zoom_by_frame (start, end, "zoom to region");
+	zoomed_to_region = true;
+}
+
+void
+Editor::toggle_zoom_region ()
+{
+	if (zoomed_to_region) {
+		swap_visual_state ();
+	} else {
+		temporal_zoom_region ();
+	}
 }
 
 void
@@ -2118,16 +2129,6 @@ Editor::play_selection ()
 }
 
 void
-Editor::play_selected_region ()
-{
-	if (!selection->regions.empty()) {
-		RegionView *rv = *(selection->regions.begin());
-
-		session->request_bounded_roll (rv->region()->position(), rv->region()->last_frame());	
-	}
-}
-
-void
 Editor::loop_selected_region ()
 {
 	if (!selection->regions.empty()) {
@@ -2280,7 +2281,7 @@ Editor::audition_playlist_region_via_route (boost::shared_ptr<Region> region, Ro
 }
 
 void
-Editor::audition_selected_region ()
+Editor::play_selected_region ()
 {
 	nframes64_t start = max_frames;
 	nframes64_t end = 0;
@@ -2300,11 +2301,7 @@ Editor::audition_selected_region ()
 		}
 	}
 
-	list<AudioRange> lr;
-	lr.push_back (AudioRange (start, end, 0));
-
-	session->set_audio_range (lr);
-	session->request_play_range (true);
+	session->request_bounded_roll (start, end);
 }
 
 void