Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / editor_markers.cc

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 04cea1bc04e72e2031013cabde827e3a97428ab7..c9a151f96ea0073b7acb2b20ac233b79e7ec1309 100644 (file)
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -17,7 +17,6 @@
 
 */
 
-#include <sigc++/retype.h>
 #include <cstdlib>
 #include <cmath>
 
@@ -1444,7 +1443,7 @@ Editor::update_punch_range_view (bool visibility)
        Location* tpl;
 
        if ((_session->config.get_punch_in() || _session->config.get_punch_out()) && ((tpl = transport_punch_location()) != 0)) {
-               ArdourCanvas::Rect const v = _track_canvas_viewport->visible_area ();
+               ArdourCanvas::Rect const v = _track_canvas->visible_area ();
                if (_session->config.get_punch_in()) {
                        transport_punch_range_rect->set_x0 (sample_to_pixel (tpl->start()));
                        transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : sample_to_pixel (JACK_MAX_FRAMES));