Merge branch 'export-dialog' into cairocanvas

[ardour.git] / gtk2_ardour / editor_summary.h

diff --git a/gtk2_ardour/editor_summary.h b/gtk2_ardour/editor_summary.h
index b465709100a5fdeffd433b7663f2e49ac2b9aebf..87474188b1275b90e8deb3de817612eb89279a18 100644 (file)
--- a/gtk2_ardour/editor_summary.h
+++ b/gtk2_ardour/editor_summary.h
@@ -20,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 {
@@ -57,16 +57,19 @@ 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 (double, double);
@@ -82,6 +85,10 @@ private:
        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);
 
        framepos_t _start; ///< start frame of the overview
        framepos_t _end; ///< end frame of the overview
@@ -105,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;
 
        bool _old_follow_playhead;
 
        PBD::ScopedConnectionList position_connection;
+       PBD::ScopedConnection route_ctrl_id_connection;
        PBD::ScopedConnectionList region_property_connection;
 };