X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_summary.h;h=6639285eea84471eac13ccb31d44a427cd7181cb;hb=24df2b559464f981e2c6a91719e3cfe2a76a197c;hp=6f9f78d712ac5b1edb713cb103b0b2de36adf601;hpb=23e7cf10191270d70357ccf0ed9294f020c7b7ab;p=ardour.git

diff --git a/gtk2_ardour/editor_summary.h b/gtk2_ardour/editor_summary.h
index 6f9f78d712..6639285eea 100644
--- a/gtk2_ardour/editor_summary.h
+++ b/gtk2_ardour/editor_summary.h
@@ -36,6 +36,7 @@ class EditorSummary : public CairoWidget, public EditorComponent, public ARDOUR:
 {
 public:
 	EditorSummary (Editor *);
+	~EditorSummary ();
 
 	void set_session (ARDOUR::Session *);
 	void set_overlays_dirty ();
@@ -43,58 +44,55 @@ public:
 	void routes_added (std::list<RouteTimeAxisView*> const &);
 
 private:
+	void parameter_changed (std::string);
 	void on_size_allocate (Gtk::Allocation& alloc);
 
 	enum Position {
 		LEFT,
-		LEFT_TOP,
-		TOP,
-		RIGHT_TOP,
 		RIGHT,
-		RIGHT_BOTTOM,
 		BOTTOM,
-		LEFT_BOTTOM,
 		INSIDE,
-		BELOW_OR_ABOVE,
-		TO_LEFT_OR_RIGHT,
-		OTHERWISE_OUTSIDE
+		TO_LEFT_OR_RIGHT
 	};
-      
+
 	void on_size_request (Gtk::Requisition *);
 	bool on_button_press_event (GdkEventButton *);
 	bool on_button_release_event (GdkEventButton *);
 	bool on_motion_notify_event (GdkEventMotion *);
 	bool on_scroll_event (GdkEventScroll *);
-        bool on_key_press_event (GdkEventKey*);
-        bool on_key_release_event (GdkEventKey*);
-        bool on_enter_notify_event (GdkEventCrossing*); 
-        bool on_leave_notify_event (GdkEventCrossing*); 
+	bool on_key_press_event (GdkEventKey*);
+	bool on_key_release_event (GdkEventKey*);
+	bool on_enter_notify_event (GdkEventCrossing*);
+	bool on_leave_notify_event (GdkEventCrossing*);
+
+	void reset_to_extents ();
 
 	void centre_on_click (GdkEventButton *);
-	void render (cairo_t *, cairo_rectangle_t*);
+	void render (Cairo::RefPtr<Cairo::Context> const&, cairo_rectangle_t*);
 	void render_region (RegionView*, cairo_t*, double) const;
-	void get_editor (std::pair<double, double> *, std::pair<double, double> *) const;
-	void set_editor (double, double);
-	void set_editor (std::pair<double, double>, double);
-	void set_editor (std::pair<double, double>, std::pair<double, double>);
+	void get_editor (std::pair<double, double>* x, std::pair<double, double>* y = NULL) const;
+	void set_editor (double);
+	void set_editor (std::pair<double, double>);
 	void set_editor_x (double);
 	void set_editor_x (std::pair<double, double>);
-	void set_editor_y (double);
-	void set_editor_y (std::pair<double, double>);
 	void playhead_position_changed (framepos_t);
-	double summary_y_to_editor (double) const;
 	double editor_y_to_summary (double) const;
 	Position get_position (double, double) const;
 	void set_cursor (Position);
-	void route_gui_changed (std::string);
+	void route_gui_changed (PBD::PropertyChange const&);
 	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);
+	framepos_t position_to_playhead_frame_to_position (double pos) const;
+	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;
 
@@ -103,14 +101,20 @@ private:
 	double _last_playhead;
 
 	std::pair<double, double> _start_editor_x;
-	std::pair<double, double> _start_editor_y;
 	double _start_mouse_x;
 	double _start_mouse_y;
 
 	Position _start_position;
 
 	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;
 
@@ -118,8 +122,8 @@ private:
 	std::pair<double, double> _pending_editor_y;
 	bool _pending_editor_changed;
 
-	bool _zoom_dragging;
-	Position _zoom_position;
+	bool _zoom_trim_dragging;
+	Position _zoom_trim_position;
 
 	bool _old_follow_playhead;
 	cairo_surface_t* _image;