Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / editor_ops.cc

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 027147bf35ff74d348a785f20cec978eac4d3479..f2990751708dac5471d7ecd6c7b7429c396fda06 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1391,8 +1391,12 @@ Editor::temporal_zoom (framecnt_t fpp)
        // Imposing an arbitrary limit to zoom out as too much zoom out produces 
        // segfaults for lack of memory. If somebody decides this is not high enough I
        // believe it can be raisen to higher values but some limit must be in place.
+       //
+       // This constant represents 1 day @ 48kHz on a 1600 pixel wide display
+       // all of which is used for the editor track displays. The whole day
+       // would be 4147200000 samples, so 2592000 samples per pixel.
 
-       nfpp = min (fpp, (framecnt_t) 8589934592);
+       nfpp = min (fpp, (framecnt_t) 2592000);
        nfpp = max ((framecnt_t) 1, fpp);
 
        new_page_size = (framepos_t) floor (_visible_canvas_width * nfpp);
@@ -3473,7 +3477,7 @@ Editor::freeze_route ()
        
        /* wait for just a little while, because the above call is asynchronous */
 
-       ::usleep (250000);
+       Glib::usleep (250000);
 
        if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) {
                return;