X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fshuttle_control.h;h=f7d3bd360175399fef0fbbdbe4275c60aa8a90df;hb=5f06ae43d87b441363afca3752c95ad5ed90f885;hp=0b289c51801086058fdf5adaec0361e1b932821f;hpb=ad017365f7a73f8ba57f667cc1aa36478b48c50e;p=ardour.git

diff --git a/gtk2_ardour/shuttle_control.h b/gtk2_ardour/shuttle_control.h
index 0b289c5180..f7d3bd3601 100644
--- a/gtk2_ardour/shuttle_control.h
+++ b/gtk2_ardour/shuttle_control.h
@@ -22,63 +22,69 @@
 #include <gtkmm/drawingarea.h>
 
 #include "gtkmm2ext/binding_proxy.h"
+#include "gtkmm2ext/cairo_widget.h"
 
 #include "pbd/controllable.h"
+
 #include "ardour/session_handle.h"
+#include "ardour/types.h"
+
+#include "ardour_button.h"
 
 namespace Gtk {
 	class Menu;
 }
 
-#include "ardour/types.h"
-
 class ShuttleControl : public CairoWidget, public ARDOUR::SessionHandlePtr
 {
-  public:
+public:
 	ShuttleControl ();
 	~ShuttleControl ();
 
 	void map_transport_state ();
-	void update_speed_display ();
-        void set_shuttle_fract (double, bool zero_ok = false);
+	void set_shuttle_fract (double, bool zero_ok = false);
 	double get_shuttle_fract () const { return shuttle_fract; }
 	void set_session (ARDOUR::Session*);
 
 	struct ShuttleControllable : public PBD::Controllable {
 		ShuttleControllable (ShuttleControl&);
-		void set_value (double);
+		void set_value (double, PBD::Controllable::GroupControlDisposition group_override);
 		double get_value (void) const;
 
-                double lower() const { return -1.0; }
-                double upper() const { return  1.0; }
+		double lower() const { return -1.0; }
+		double upper() const { return  1.0; }
 
 		ShuttleControl& sc;
 	};
 
 	boost::shared_ptr<ShuttleControllable> controllable() const { return _controllable; }
+	void set_colors ();
+
+	ArdourButton* info_button () { return &_info_button; }
 
-  protected:
+protected:
 	bool _hovering;
 	float  shuttle_max_speed;
 	float  last_speed_displayed;
 	bool   shuttle_grabbed;
 	double shuttle_speed_on_grab;
+	double requested_speed;
 	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;
+	ArdourButton _info_button;
 	Gtk::Menu*        shuttle_unit_menu;
 	Gtk::Menu*        shuttle_style_menu;
 	Gtk::Menu*        shuttle_context_menu;
 	BindingProxy      binding_proxy;
-
+	float bg_r, bg_g, bg_b;
 	void build_shuttle_context_menu ();
-	void show_shuttle_context_menu ();
 	void shuttle_style_changed();
-	void shuttle_unit_clicked ();
 	void set_shuttle_max_speed (float);
+	void reset_speed ();
 
 	bool on_enter_notify_event (GdkEventCrossing*);
 	bool on_leave_notify_event (GdkEventCrossing*);
@@ -87,13 +93,13 @@ class ShuttleControl : public CairoWidget, public ARDOUR::SessionHandlePtr
 	bool on_scroll_event (GdkEventScroll*);
 	bool on_motion_notify_event(GdkEventMotion*);
 
-	void render (cairo_t *, cairo_rectangle_t*);
+	void render (Cairo::RefPtr<Cairo::Context> const&, cairo_rectangle_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, bool zero_ok = false);
+	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);