X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fshuttle_control.h;h=bba5f17df13ac5fae18547e8106534e28d65eecc;hb=79731a716deae9a90be646695480f06f92c268f5;hp=f7d3bd360175399fef0fbbdbe4275c60aa8a90df;hpb=d06de26a4fd828b6a0a9da8718e3b0c829a4d162;p=ardour.git

diff --git a/gtk2_ardour/shuttle_control.h b/gtk2_ardour/shuttle_control.h
index f7d3bd3601..bba5f17df1 100644
--- a/gtk2_ardour/shuttle_control.h
+++ b/gtk2_ardour/shuttle_control.h
@@ -21,15 +21,15 @@
 
 #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"
+#include "gtkmm2ext/cairo_widget.h"
+
+#include "widgets/ardour_button.h"
+#include "widgets/binding_proxy.h"
 
 namespace Gtk {
 	class Menu;
@@ -60,7 +60,7 @@ public:
 	boost::shared_ptr<ShuttleControllable> controllable() const { return _controllable; }
 	void set_colors ();
 
-	ArdourButton* info_button () { return &_info_button; }
+	ArdourWidgets::ArdourButton* info_button () { return &_info_button; }
 
 protected:
 	bool _hovering;
@@ -75,11 +75,11 @@ protected:
 	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;
+	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 shuttle_style_changed();