X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_summary.h;h=96d20fffa6ceb5515c2cdc2dcd37f025447ce658;hb=4f3bddf7ef163c3106ba973123cbc657ebaf4b74;hp=79c41742623098a273d7768c593ff5fce887a536;hpb=2bc94116e85caf60f08ac020ec16858e42e2d332;p=ardour.git

diff --git a/gtk2_ardour/editor_summary.h b/gtk2_ardour/editor_summary.h
index 79c4174262..96d20fffa6 100644
--- a/gtk2_ardour/editor_summary.h
+++ b/gtk2_ardour/editor_summary.h
@@ -20,7 +20,8 @@
 #ifndef __gtk_ardour_editor_summary_h__
 #define __gtk_ardour_editor_summary_h__
 
-#include <gtkmm/eventbox.h>
+#include "cairo_widget.h"
+#include "editor_component.h"
 
 namespace ARDOUR {
 	class Session;
@@ -31,39 +32,37 @@ 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 Gtk::EventBox
+class EditorSummary : public CairoWidget, public EditorComponent
 {
 public:
 	EditorSummary (Editor *);
-	~EditorSummary ();
 
-	void set_session (ARDOUR::Session *);
-	void set_dirty ();
-	void set_bounds_dirty ();
+	void connect_to_session (ARDOUR::Session *);
+	void set_overlays_dirty ();
 
 private:
-	void centre_on_click (GdkEventButton *);
 	bool on_expose_event (GdkEventExpose *);
 	void on_size_request (Gtk::Requisition *);
-	void on_size_allocate (Gtk::Allocation &);
 	bool on_button_press_event (GdkEventButton *);
 	bool on_button_release_event (GdkEventButton *);
 	bool on_motion_notify_event (GdkEventMotion *);
 	bool on_scroll_event (GdkEventScroll *);
 
+	void centre_on_click (GdkEventButton *);
 	void render (cairo_t *);
-	GdkPixmap* get_pixmap (GdkDrawable *);
 	void render_region (RegionView*, cairo_t*, nframes_t, double) const;
-	void editor_view (std::pair<double, double> *, std::pair<double, double> *) const;
-
-	Editor* _editor; ///< our editor
-	ARDOUR::Session* _session; ///< our session
-	GdkPixmap* _pixmap; ///< pixmap containing a rendering of the region views, or 0
-	bool _regions_dirty; ///< true if _pixmap requires re-rendering, otherwise false
-	int _width; ///< pixmap width
-	int _height; ///< pixmap height
+	void get_editor (std::pair<double, double> *, std::pair<double, double> *) const;
+	void set_editor (std::pair<double, double> const &, std::pair<double, double> const &);
+	void playhead_position_changed (nframes64_t);
+
 	double _x_scale; ///< pixels per frame for the x axis of the pixmap
 	double _y_scale;
+	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;
 
 	bool _move_dragging;
 	double _x_offset;
@@ -71,18 +70,7 @@ private:
 	bool _moved;
 
 	bool _zoom_dragging;
-	double _mouse_x_start;
-	double _width_start;
-	double _zoom_start;
-	nframes64_t _frames_start;
-
-	enum ZoomPosition {
-		LEFT,
-		RIGHT,
-		NONE
-	};
-
-	ZoomPosition _zoom_position;
+	bool _zoom_left;
 };
 
 #endif