X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_summary.h;h=507295cfffbad03198b0ceccf5d8905bc2700824;hb=e42699600b92db69a428979dc0412c96f7494141;hp=86f2e793900f492870b9c2dc85f0c9f420feabf7;hpb=73192bc1a7ea55fa1864dc3826845b15c00dd2ec;p=ardour.git

diff --git a/gtk2_ardour/editor_summary.h b/gtk2_ardour/editor_summary.h
index 86f2e79390..507295cfff 100644
--- a/gtk2_ardour/editor_summary.h
+++ b/gtk2_ardour/editor_summary.h
@@ -1,4 +1,3 @@
-
 /*
     Copyright (C) 2009 Paul Davis
 
@@ -21,7 +20,7 @@
 #ifndef __gtk_ardour_editor_summary_h__
 #define __gtk_ardour_editor_summary_h__
 
-#include "cairo_widget.h"
+#include "gtkmm2ext/cairo_widget.h"
 #include "editor_component.h"
 
 namespace ARDOUR {
@@ -33,79 +32,103 @@ class Editor;
 /** Class to provide a visual summary of the contents of an editor window; represents
  *  the whole session as a set of lines, one per region view.
  */
-class EditorSummary : public CairoWidget, public EditorComponent, public ARDOUR::SessionHandlePtr
+class EditorSummary : public CairoWidget, public EditorComponent, public ARDOUR::SessionHandlePtr, public PBD::ScopedConnectionList
 {
 public:
 	EditorSummary (Editor *);
+	~EditorSummary ();
 
 	void set_session (ARDOUR::Session *);
 	void set_overlays_dirty ();
+	void set_background_dirty ();
+	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
 	};
 
-	bool on_expose_event (GdkEventExpose *);
 	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*);
+
+	void reset_to_extents ();
 
 	void centre_on_click (GdkEventButton *);
-	void render (cairo_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 (std::pair<double, double> const &, double);
-	void set_editor (std::pair<double, double> const &, std::pair<double, double> const &);
-	void set_editor_x (std::pair<double, double> const &);
-	void set_editor_y (double);
-	void set_editor_y (std::pair<double, double> const &);
-	void playhead_position_changed (framepos_t);
-	double summary_y_to_editor (double) const;
+	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 playhead_position_changed (samplepos_t);
 	double editor_y_to_summary (double) const;
 	Position get_position (double, double) const;
 	void set_cursor (Position);
+	void route_gui_changed (PBD::PropertyChange const&);
+	bool suspending_editor_updates () const;
+	double playhead_sample_to_position (samplepos_t) const;
+	samplepos_t position_to_playhead_sample_to_position (double pos) const;
+	void set_overlays_dirty_rect (int, int, int, int);
 
-	framepos_t _start; ///< start frame of the overview
-	framepos_t _end; ///< end frame of the overview
+	void summary_zoom_step (  int steps );
 
-	/** fraction of the session length by which the overview size should extend past the start and end markers */
-	double _overhang_fraction;
+	samplepos_t _start; ///< start sample of the overview
+	samplepos_t _end; ///< end sample of the overview
 
-	double _x_scale; ///< pixels per frame for the x axis of the pixmap
+	samplepos_t _leftmost; ///< the earliest sample we ever viewed
+	samplepos_t _rightmost; ///< the latest sample we ever viewed
+
+	double _x_scale; ///< pixels per sample for the x axis of the pixmap
 	double _track_height;
 	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;
 
-	bool _zoom_dragging;
-	Position _zoom_position;
+	std::pair<double, double> _pending_editor_x;
+	std::pair<double, double> _pending_editor_y;
+	bool _pending_editor_changed;
+
+	bool _zoom_trim_dragging;
+	Position _zoom_trim_position;
+
+	bool _old_follow_playhead;
+	cairo_surface_t* _image;
+	void render_background_image ();
+	bool _background_dirty;
 
 	PBD::ScopedConnectionList position_connection;
+	PBD::ScopedConnection route_ctrl_id_connection;
 	PBD::ScopedConnectionList region_property_connection;
 };