X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fshuttle_control.h;h=bba5f17df13ac5fae18547e8106534e28d65eecc;hb=474d68c05132291fd8eb200006e7e63aebefdc8d;hp=4256d87536ca8e8c68c8122715b20d2946f4dd0d;hpb=718b2eab6706f304e398f036e3d817567cd746e8;p=ardour.git

diff --git a/gtk2_ardour/shuttle_control.h b/gtk2_ardour/shuttle_control.h
index 4256d87536..bba5f17df1 100644
--- a/gtk2_ardour/shuttle_control.h
+++ b/gtk2_ardour/shuttle_control.h
@@ -22,70 +22,94 @@
 #include <gtkmm/drawingarea.h>
 
 #include "pbd/controllable.h"
+
 #include "ardour/session_handle.h"
+#include "ardour/types.h"
+
+#include "gtkmm2ext/cairo_widget.h"
+
+#include "widgets/ardour_button.h"
+#include "widgets/binding_proxy.h"
 
 namespace Gtk {
 	class Menu;
 }
 
-#include "ardour/types.h"
-
-class ShuttleControl : public Gtk::DrawingArea, public ARDOUR::SessionHandlePtr 
+class ShuttleControl : public CairoWidget, public ARDOUR::SessionHandlePtr
 {
-  public:
+public:
 	ShuttleControl ();
 	~ShuttleControl ();
 
 	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*);
 
 	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;
-		
-		void set_id (const std::string&);
-		
+
+		double lower() const { return -1.0; }
+		double upper() const { return  1.0; }
+
 		ShuttleControl& sc;
 	};
 
-	ShuttleControllable& controllable() { return _controllable; }
+	boost::shared_ptr<ShuttleControllable> controllable() const { return _controllable; }
+	void set_colors ();
+
+	ArdourWidgets::ArdourButton* info_button () { return &_info_button; }
 
-  protected:
+protected:
+	bool _hovering;
 	float  shuttle_max_speed;
 	float  last_speed_displayed;
 	bool   shuttle_grabbed;
-	double shuttle_fract;
-	ShuttleControllable _controllable;
+	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;
-	Gtk::Menu*        shuttle_unit_menu;
-	Gtk::Menu*        shuttle_style_menu;
-	Gtk::Menu*        shuttle_context_menu;
-
+	ArdourWidgets::ArdourButton _info_button;
+	Gtk::Menu*                  shuttle_unit_menu;
+	Gtk::Menu*                  shuttle_style_menu;
+	Gtk::Menu*                  shuttle_context_menu;
+	ArdourWidgets::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*);
 	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::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);
+	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, 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__ */