Slightly hacky fix for AFL/PFL button misbehaviour

[ardour.git] / gtk2_ardour / shuttle_control.h

diff --git a/gtk2_ardour/shuttle_control.h b/gtk2_ardour/shuttle_control.h
index 76b740658959dd5bf6a6847dd70c3151a3fb595e..ab58969743bbb5609dafeb9628b4cbb6c6134b2e 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 Gtk::DrawingArea, public ARDOUR::SessionHandlePtr
 {
   public:
        ShuttleControl ();
@@ -48,9 +48,7 @@ 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&);
-               
+
                ShuttleControl& sc;
        };
 
@@ -60,7 +58,8 @@ class ShuttleControl : public Gtk::DrawingArea, public ARDOUR::SessionHandlePtr
        float  shuttle_max_speed;
        float  last_speed_displayed;
        bool   shuttle_grabbed;
-       double shuttle_fract;
+       double shuttle_speed_on_grab;
+       float shuttle_fract;
        boost::shared_ptr<ShuttleControllable> _controllable;
        cairo_pattern_t* pattern;
        ARDOUR::microseconds_t last_shuttle_request;
@@ -82,6 +81,7 @@ class ShuttleControl : public Gtk::DrawingArea, public ARDOUR::SessionHandlePtr
        bool on_motion_notify_event(GdkEventMotion*);
        bool on_expose_event(GdkEventExpose*);
        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);
@@ -89,6 +89,12 @@ class ShuttleControl : public Gtk::DrawingArea, public ARDOUR::SessionHandlePtr
 
        void set_shuttle_units (ARDOUR::ShuttleUnits);
        void set_shuttle_style (ARDOUR::ShuttleBehaviour);
+
+       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__ */