make click on empty canvas area clear selection; change zoom-ot-region to be a toggle...

[ardour.git] / gtk2_ardour / editor_ops.cc

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 5edd0e15c48fe56411c4963f5bad8d2d2af8d33f..f3a493e1959f215e55bd361ddab4777c04ea6453 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1563,7 +1563,42 @@ Editor::temporal_zoom_region ()
                }
        }
 
+       /* now comes an "interesting" hack ... make sure we leave a little space
+          at each end of the editor so that the zoom doesn't fit the region
+          precisely to the screen.
+       */
+
+       GdkScreen* screen = gdk_screen_get_default ();
+       gint pixwidth = gdk_screen_get_width (screen);
+       gint mmwidth = gdk_screen_get_width_mm (screen);
+       double pix_per_mm = (double) pixwidth/ (double) mmwidth;
+       double one_centimeter_in_pixels = pix_per_mm * 10.0;
+       nframes_t extra_samples = unit_to_frame (one_centimeter_in_pixels);
+       
+       if (start > extra_samples) {
+               start -= extra_samples;
+       } else {
+               start = 0;
+       } 
+
+       if (max_frames - extra_samples > end) {
+               end += extra_samples;
+       } else {
+               end = max_frames;
+       }
+
        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
@@ -2093,16 +2128,6 @@ Editor::play_selection ()
        session->request_play_range (true);
 }
 
-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 ()
 {
@@ -2256,12 +2281,27 @@ Editor::audition_playlist_region_via_route (boost::shared_ptr<Region> region, Ro
 }
 
 void
-Editor::audition_selected_region ()
+Editor::play_selected_region ()
 {
-       if (!selection->regions.empty()) {
-               RegionView* rv = *(selection->regions.begin());
-               session->audition_region (rv->region());
+       nframes64_t start = max_frames;
+       nframes64_t end = 0;
+
+       ensure_entered_region_selected (true);
+
+       if (selection->regions.empty()) {
+               return;
        }
+
+       for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+               if ((*i)->region()->position() < start) {
+                       start = (*i)->region()->position();
+               }
+               if ((*i)->region()->last_frame() + 1 > end) {
+                       end = (*i)->region()->last_frame() + 1;
+               }
+       }
+
+       session->request_bounded_roll (start, end);
 }
 
 void
@@ -4600,3 +4640,15 @@ Editor::set_punch_from_edit_range ()
        set_punch_range (start, end,  _("set punch range from edit range"));
 }
 
+void
+Editor::pitch_shift_regions ()
+{
+       ensure_entered_region_selected (true);
+       
+       if (selection->regions.empty()) {
+               return;
+       }
+
+       pitch_shift (selection->regions, 1.2);
+}
+