PBD::Signal<...>::connect() is already thread safe, so drop intermediate proxy/call_s...

[ardour.git] / gtk2_ardour / stereo_panner.h

diff --git a/gtk2_ardour/stereo_panner.h b/gtk2_ardour/stereo_panner.h
index ba9823214691c920157ae789d69cf27e0894d0c6..282d85d12f23b2f83cfb0c2443a782e7798bb385 100644 (file)
--- a/gtk2_ardour/stereo_panner.h
+++ b/gtk2_ardour/stereo_panner.h
@@ -29,11 +29,11 @@ namespace ARDOUR {
 }
 
 namespace PBD {
-        class Controllable;
+       class Controllable;
 }
 
 namespace ARDOUR {
-        class Panner;
+       class Panner;
 }
 
 class StereoPanner : public PannerInterface
@@ -42,8 +42,8 @@ class StereoPanner : public PannerInterface
        StereoPanner (boost::shared_ptr<ARDOUR::PannerShell>);
        ~StereoPanner ();
 
-        boost::shared_ptr<PBD::Controllable> get_position_controllable() const { return position_control; }
-        boost::shared_ptr<PBD::Controllable> get_width_controllable() const { return width_control; }
+       boost::shared_ptr<PBD::Controllable> get_position_controllable() const { return position_control; }
+       boost::shared_ptr<PBD::Controllable> get_width_controllable() const { return width_control; }
 
        sigc::signal<void> StartPositionGesture;
        sigc::signal<void> StopPositionGesture;
@@ -55,52 +55,52 @@ class StereoPanner : public PannerInterface
        bool on_button_press_event (GdkEventButton*);
        bool on_button_release_event (GdkEventButton*);
        bool on_motion_notify_event (GdkEventMotion*);
-        bool on_scroll_event (GdkEventScroll*);
-        bool on_key_press_event (GdkEventKey*);
+       bool on_scroll_event (GdkEventScroll*);
+       bool on_key_press_event (GdkEventKey*);
 
   private:
        PannerEditor* editor ();
        boost::shared_ptr<ARDOUR::PannerShell> _panner_shell;
 
-        boost::shared_ptr<PBD::Controllable> position_control;
-        boost::shared_ptr<PBD::Controllable> width_control;
-        PBD::ScopedConnectionList panvalue_connections;
-        PBD::ScopedConnectionList panshell_connections;
-        bool dragging_position;
-        bool dragging_left;
-        bool dragging_right;
-        int drag_start_x;
-        int last_drag_x;
-        double accumulated_delta;
-        bool detented;
-
-        BindingProxy position_binder;
-        BindingProxy width_binder;
-
-        void set_tooltip ();
-
-        struct ColorScheme {
-            uint32_t outline;
-            uint32_t fill;
-            uint32_t text;
-            uint32_t background;
-            uint32_t rule;
-        };
-
-        enum State {
-                Normal,
-                Mono,
-                Inverted
-        };
+       boost::shared_ptr<PBD::Controllable> position_control;
+       boost::shared_ptr<PBD::Controllable> width_control;
+       PBD::ScopedConnectionList panvalue_connections;
+       PBD::ScopedConnectionList panshell_connections;
+       bool dragging_position;
+       bool dragging_left;
+       bool dragging_right;
+       int drag_start_x;
+       int last_drag_x;
+       double accumulated_delta;
+       bool detented;
+
+       BindingProxy position_binder;
+       BindingProxy width_binder;
+
+       void set_tooltip ();
+
+       struct ColorScheme {
+               uint32_t outline;
+               uint32_t fill;
+               uint32_t text;
+               uint32_t background;
+               uint32_t rule;
+       };
+
+       enum State {
+               Normal,
+               Mono,
+               Inverted
+       };
 
        bool _dragging;
 
        static Pango::AttrList panner_font_attributes;
        static bool have_font;
 
-        static ColorScheme colors[3];
-        static void set_colors ();
-        static bool have_colors;
+       static ColorScheme colors[3];
+       static void set_colors ();
+       static bool have_colors;
        void color_handler ();
        void bypass_handler ();
        void pannable_handler ();