when calculating average slave/master delta, use absolute value.

[ardour.git] / gtk2_ardour / editor_summary.h

diff --git a/gtk2_ardour/editor_summary.h b/gtk2_ardour/editor_summary.h
index d237746b9e030c80b9d5704f4d34b2b59d1da764..6639285eea84471eac13ccb31d44a427cd7181cb 100644 (file)
--- a/gtk2_ardour/editor_summary.h
+++ b/gtk2_ardour/editor_summary.h
@@ -65,6 +65,8 @@ private:
        bool on_enter_notify_event (GdkEventCrossing*);
        bool on_leave_notify_event (GdkEventCrossing*);
 
+       void reset_to_extents ();
+
        void centre_on_click (GdkEventButton *);
        void render (Cairo::RefPtr<Cairo::Context> const&, cairo_rectangle_t*);
        void render_region (RegionView*, cairo_t*, double) const;
@@ -81,11 +83,16 @@ private:
        bool suspending_editor_updates () const;
        double playhead_frame_to_position (framepos_t) const;
        framepos_t position_to_playhead_frame_to_position (double pos) const;
-       void set_overlays_dirty (int, int, int, int);
+       void set_overlays_dirty_rect (int, int, int, int);
+
+       void summary_zoom_step (  int steps );
 
        framepos_t _start; ///< start frame of the overview
        framepos_t _end; ///< end frame of the overview
 
+       framepos_t _leftmost; ///< the earliest frame we ever viewed
+       framepos_t _rightmost; ///< the latest frame we ever viewed
+
        /** fraction of the session length by which the overview size should extend past the start and end markers */
        double _overhang_fraction;
 
@@ -99,10 +106,15 @@ private:
 
        Position _start_position;
 
-       bool _begin_dragging;
-
        bool _move_dragging;
-       bool _moved;
+
+       //used for zooming
+       int _last_mx;
+       int _last_my;
+       int _last_dx;
+       int _last_dy;
+       int _last_y_delta;
+
        std::pair<double, double> _view_rectangle_x;
        std::pair<double, double> _view_rectangle_y;
 
@@ -113,9 +125,6 @@ private:
        bool _zoom_trim_dragging;
        Position _zoom_trim_position;
 
-       bool _zoom_dragging;
-       double _zoom_last_y;
-
        bool _old_follow_playhead;
        cairo_surface_t* _image;
        void render_background_image ();