X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fshuttle_control.h;h=31be53c976c9f40c8ac886aa037e37ccae9cdf4f;hb=7745a373940a0bcabd618b5b66c6b8916045ea9e;hp=1306af292b7264a57c019fd5036b1b47b18a6fa6;hpb=509cd57c74ad386267f6df371acd04d17569336c;p=ardour.git

diff --git a/gtk2_ardour/shuttle_control.h b/gtk2_ardour/shuttle_control.h
index 1306af292b..31be53c976 100644
--- a/gtk2_ardour/shuttle_control.h
+++ b/gtk2_ardour/shuttle_control.h
@@ -22,6 +22,7 @@
 #include <gtkmm/drawingarea.h>
 
 #include "gtkmm2ext/binding_proxy.h"
+#include "gtkmm2ext/cairo_widget.h"
 
 #include "pbd/controllable.h"
 #include "ardour/session_handle.h"
@@ -32,69 +33,83 @@ namespace Gtk {
 
 #include "ardour/types.h"
 
-class ShuttleControl : public Gtk::DrawingArea, public ARDOUR::SessionHandlePtr 
+class ShuttleControl : public CairoWidget, public ARDOUR::SessionHandlePtr
 {
   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;
 	};
 
 	boost::shared_ptr<ShuttleControllable> controllable() const { return _controllable; }
+	void set_colors ();
 
   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;
 	Gtk::Menu*        shuttle_style_menu;
 	Gtk::Menu*        shuttle_context_menu;
 	BindingProxy      binding_proxy;
-
+	Glib::RefPtr<Pango::Layout> left_text;
+	Glib::RefPtr<Pango::Layout> right_text;
+	Pango::AttrList text_attributes;
+	Pango::AttrColor* text_color;
+	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_t *, 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);
+        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__ */