use syntactic sugar

[ardour.git] / gtk2_ardour / mini_timeline.h

diff --git a/gtk2_ardour/mini_timeline.h b/gtk2_ardour/mini_timeline.h
index d0b07d0a625b1285e6c89b343d5120b4b1690fc7..b0cb5ee8cda4d9a4bf1e99611e7c33bd5a218b6f 100644 (file)
--- a/gtk2_ardour/mini_timeline.h
+++ b/gtk2_ardour/mini_timeline.h
@@ -25,6 +25,7 @@
 #include "pbd/signals.h"
 
 #include "ardour/ardour.h"
+#include "ardour/types.h"
 #include "ardour/session_handle.h"
 
 #include "gtkmm2ext/cairo_widget.h"
@@ -36,6 +37,10 @@ namespace ARDOUR {
        class Session;
 }
 
+namespace Gtk {
+       class Menu;
+}
+
 class MiniTimeline : public CairoWidget, public ARDOUR::SessionHandlePtr, public PBD::ScopedConnectionList
 {
 
@@ -50,38 +55,61 @@ private:
        void super_rapid_update ();
 
        void on_size_request (Gtk::Requisition*);
+       void on_size_allocate (Gtk::Allocation&);
        void on_style_changed (const Glib::RefPtr<Gtk::Style>&);
        void on_name_changed ();
        void set_colors ();
        void parameter_changed (std::string const &);
 
        void calculate_time_width ();
+       void calculate_time_spacing ();
        void update_minitimeline ();
-       void draw_dots (cairo_t*, int left, int right, int y, ArdourCanvas::Color);
-       int  draw_mark (cairo_t*, int x0, int x1, int h, const std::string&);
+       void draw_dots (cairo_t*, int left, int right, int y, Gtkmm2ext::Color);
+       int  draw_mark (cairo_t*, int x0, int x1, const std::string&, bool& prelight);
+       int  draw_edge (cairo_t*, int x0, int x1, bool left, const std::string&, bool& prelight);
 
-       void render (cairo_t*, cairo_rectangle_t*);
-       void format_time (framepos_t when);
+       void render (Cairo::RefPtr<Cairo::Context> const&, cairo_rectangle_t*);
+       void format_time (samplepos_t when);
 
-       bool on_button_release_event (GdkEventButton *ev);
+       bool on_button_press_event (GdkEventButton*);
+       bool on_button_release_event (GdkEventButton*);
        bool on_scroll_event (GdkEventScroll*);
+       bool on_motion_notify_event (GdkEventMotion*);
+       bool on_leave_notify_event (GdkEventCrossing*);
+
+       void build_minitl_context_menu ();
+       void set_span (ARDOUR::samplecnt_t);
 
        Glib::RefPtr<Pango::Layout> _layout;
        sigc::connection super_rapid_connection;
        PBD::ScopedConnectionList marker_connection;
-       PBD::ScopedConnection session_connection;
+       PBD::ScopedConnectionList session_connection;
 
-       framepos_t _last_update_frame;
+       samplepos_t _last_update_sample;
        AudioClock::Mode _clock_mode;
        int _time_width;
        int _time_height;
 
+       int _n_labels;
+       double _px_per_sample;
+       ARDOUR::samplecnt_t _time_granularity;
+       ARDOUR::samplecnt_t _time_span_samples;
+       int _marker_height;
+
+       int _pointer_x;
+       int _pointer_y;
+
+       Gtk::Menu* _minitl_context_menu;
+
+       uint32_t _phead_color;
+
        struct JumpRange {
-               JumpRange (int l, int r, framepos_t t)
-                       : left (l), right (r), to (t) {}
+               JumpRange (int l, int r, samplepos_t t, bool p = false)
+                       : left (l), right (r), to (t), prelight (p) {}
                int left;
                int right;
-               framepos_t to;
+               samplepos_t to;
+               bool prelight;
        };
 
        typedef std::list <JumpRange> JumpList;