missing initialization

[ardour.git] / gtk2_ardour / shuttle_control.h

diff --git a/gtk2_ardour/shuttle_control.h b/gtk2_ardour/shuttle_control.h
index 1306af292b7264a57c019fd5036b1b47b18a6fa6..a8c2e71d59807f8e06d31f82d7e1bcacdcacf01e 100644 (file)
--- a/gtk2_ardour/shuttle_control.h
+++ b/gtk2_ardour/shuttle_control.h
@@ -32,7 +32,7 @@ namespace Gtk {
 
 #include "ardour/types.h"
 
-class ShuttleControl : public Gtk::DrawingArea, public ARDOUR::SessionHandlePtr 
+class ShuttleControl : public CairoWidget, public ARDOUR::SessionHandlePtr
 {
   public:
        ShuttleControl ();
@@ -40,7 +40,7 @@ class ShuttleControl : public Gtk::DrawingArea, public ARDOUR::SessionHandlePtr
 
        void map_transport_state ();
        void update_speed_display ();
-       void set_shuttle_fract (double);
+        void set_shuttle_fract (double, bool zero_ok = false);
        double get_shuttle_fract () const { return shuttle_fract; }
        void set_session (ARDOUR::Session*);
 
@@ -48,21 +48,25 @@ class ShuttleControl : public Gtk::DrawingArea, public ARDOUR::SessionHandlePtr
                ShuttleControllable (ShuttleControl&);
                void set_value (double);
                double get_value (void) const;
-               
-               void set_id (const std::string&);
-               
+
+                double lower() const { return -1.0; }
+                double upper() const { return  1.0; }
+
                ShuttleControl& sc;
        };
 
        boost::shared_ptr<ShuttleControllable> controllable() const { return _controllable; }
 
   protected:
+       bool _hovering;
        float  shuttle_max_speed;
        float  last_speed_displayed;
        bool   shuttle_grabbed;
+       double shuttle_speed_on_grab;
        float shuttle_fract;
        boost::shared_ptr<ShuttleControllable> _controllable;
        cairo_pattern_t* pattern;
+       cairo_pattern_t* shine_pattern;
        ARDOUR::microseconds_t last_shuttle_request;
        PBD::ScopedConnection parameter_connection;
        Gtk::Menu*        shuttle_unit_menu;
@@ -76,25 +80,30 @@ class ShuttleControl : public Gtk::DrawingArea, public ARDOUR::SessionHandlePtr
        void shuttle_unit_clicked ();
        void set_shuttle_max_speed (float);
 
+       bool on_enter_notify_event (GdkEventCrossing*);
+       bool on_leave_notify_event (GdkEventCrossing*);
        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_expose_event(GdkEventExpose*);
+
+       void render (cairo_t *);
+
        void on_size_allocate (Gtk::Allocation&);
        bool on_query_tooltip (int, int, bool, const Glib::RefPtr<Gtk::Tooltip>&);
 
-       gint mouse_shuttle (double x, bool force);
-       void use_shuttle_fract (bool force);
+        gint mouse_shuttle (double x, bool force);
+        void use_shuttle_fract (bool force, bool zero_ok = false);
        void parameter_changed (std::string);
 
        void set_shuttle_units (ARDOUR::ShuttleUnits);
        void set_shuttle_style (ARDOUR::ShuttleBehaviour);
 
-       int speed_as_semitones (float);
-       float semitones_as_speed (int);
-       float semitones_as_fract (int);
-       int fract_as_semitones (float);
+       int speed_as_semitones (float, bool&);
+       int fract_as_semitones (float, bool&);
+
+       float semitones_as_speed (int, bool);
+       float semitones_as_fract (int, bool);
 };
 
 #endif /* __gtk2_ardour_shuttle_control_h__ */