X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_summary.h;h=87474188b1275b90e8deb3de817612eb89279a18;hb=5399425f534e2d96d07cf29f427bfa0f39d904b7;hp=283cd63c02f0021046439be306940c14a4efbdb2;hpb=a54f107d4f9106a1fe67357030086682f4d7151a;p=ardour.git

diff --git a/gtk2_ardour/editor_summary.h b/gtk2_ardour/editor_summary.h
index 283cd63c02..87474188b1 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,13 +32,14 @@ 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
+class EditorSummary : public CairoWidget, public EditorComponent, public ARDOUR::SessionHandlePtr, public PBD::ScopedConnectionList
 {
 public:
 	EditorSummary (Editor *);
 
 	void set_session (ARDOUR::Session *);
 	void set_overlays_dirty ();
+	void routes_added (std::list<RouteTimeAxisView*> const &);
 
 private:
 
@@ -57,31 +57,41 @@ private:
 		TO_LEFT_OR_RIGHT,
 		OTHERWISE_OUTSIDE
 	};
-
-	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 centre_on_click (GdkEventButton *);
-	void render (cairo_t *);
+	void render (cairo_t *, 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 (double, double);
+	void set_editor (std::pair<double, double>, double);
+	void set_editor (std::pair<double, double>, 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> const &);
-	void playhead_position_changed (nframes64_t);
+	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);
+	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);
 
-	nframes_t _start; ///< start frame of the overview
-	nframes_t _end; ///< end frame of the overview
+	framepos_t _start; ///< start frame of the overview
+	framepos_t _end; ///< end frame of the overview
 
 	/** fraction of the session length by which the overview size should extend past the start and end markers */
 	double _overhang_fraction;
@@ -102,12 +112,17 @@ private:
 	std::pair<double, double> _view_rectangle_x;
 	std::pair<double, double> _view_rectangle_y;
 
+	std::pair<double, double> _pending_editor_x;
+	std::pair<double, double> _pending_editor_y;
+	bool _pending_editor_changed;
+
 	bool _zoom_dragging;
 	Position _zoom_position;
-	std::pair<double, double> _pending_zoom_x;
-	std::pair<double, double> _pending_zoom_y;
+
+	bool _old_follow_playhead;
 
 	PBD::ScopedConnectionList position_connection;
+	PBD::ScopedConnection route_ctrl_id_connection;
 	PBD::ScopedConnectionList region_property_connection;
 };