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 1306af292b7264a57c019fd5036b1b47b18a6fa6..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,6 +58,7 @@ class ShuttleControl : public Gtk::DrawingArea, public ARDOUR::SessionHandlePtr
        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;
@@ -91,10 +90,11 @@ 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);
-       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__ */