X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fshuttle_control.h;h=bba5f17df13ac5fae18547e8106534e28d65eecc;hb=176cdecd03c9195d12396c0f04b5c375fb9af32e;hp=1b6cce587045243cb82c89da46e80129d15ce74d;hpb=5c926136988757f1f11a14c11720ed3daac3195f;p=ardour.git diff --git a/gtk2_ardour/shuttle_control.h b/gtk2_ardour/shuttle_control.h index 1b6cce5870..bba5f17df1 100644 --- a/gtk2_ardour/shuttle_control.h +++ b/gtk2_ardour/shuttle_control.h @@ -21,15 +21,15 @@ #include -#include "gtkmm2ext/binding_proxy.h" -#include "gtkmm2ext/cairo_widget.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; @@ -76,10 +76,10 @@ protected: ARDOUR::microseconds_t last_shuttle_request; PBD::ScopedConnection parameter_connection; ArdourWidgets::ArdourButton _info_button; - Gtk::Menu* shuttle_unit_menu; - Gtk::Menu* shuttle_style_menu; - Gtk::Menu* shuttle_context_menu; - BindingProxy binding_proxy; + 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();