X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_summary.h;h=2b1e5be791da4467dac64c8cbed3d3e4384f7924;hb=8b3d50f7e6c4ab7575b169cccc54efc0e2a94fd0;hp=fa72b929b77344ec8a90852e83d6f07a40ce3475;hpb=e1a63db0db053c6e799d530d28dbd9b90f736756;p=ardour.git

diff --git a/gtk2_ardour/editor_summary.h b/gtk2_ardour/editor_summary.h
index fa72b929b7..2b1e5be791 100644
--- a/gtk2_ardour/editor_summary.h
+++ b/gtk2_ardour/editor_summary.h
@@ -1,4 +1,3 @@
-
 /*
     Copyright (C) 2009 Paul Davis
 
@@ -33,15 +32,32 @@ 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:
+
+	enum Position {
+		LEFT,
+		LEFT_TOP,
+		TOP,
+		RIGHT_TOP,
+		RIGHT,
+		RIGHT_BOTTOM,
+		BOTTOM,
+		LEFT_BOTTOM,
+		INSIDE,
+		BELOW_OR_ABOVE,
+		TO_LEFT_OR_RIGHT,
+		OTHERWISE_OUTSIDE
+	};
+
 	bool on_expose_event (GdkEventExpose *);
 	void on_size_request (Gtk::Requisition *);
 	bool on_button_press_event (GdkEventButton *);
@@ -54,11 +70,19 @@ private:
 	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 playhead_position_changed (nframes64_t);
+	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;
+	double editor_y_to_summary (double) const;
+	Position get_position (double, double) const;
+	void set_cursor (Position);
+	void route_gui_changed (std::string);
 
-	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;
@@ -71,19 +95,18 @@ private:
 	std::pair<double, double> _start_editor_y;
 	double _start_mouse_x;
 	double _start_mouse_y;
-	enum {
-		IN_VIEWBOX,
-		BELOW_OR_ABOVE_VIEWBOX,
-		TO_LEFT_OR_RIGHT_OF_VIEWBOX
-	} _start_position;
+
+	Position _start_position;
 
 	bool _move_dragging;
-	double _x_offset;
-	double _y_offset;
 	bool _moved;
+	std::pair<double, double> _view_rectangle_x;
+	std::pair<double, double> _view_rectangle_y;
 
 	bool _zoom_dragging;
-	bool _zoom_left;
+	Position _zoom_position;
+
+	bool _old_follow_playhead;
 
 	PBD::ScopedConnectionList position_connection;
 	PBD::ScopedConnectionList region_property_connection;