X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstereo_panner.h;h=f1e1025d76f5ae8e076ae46d26d7601b2b904db6;hb=9b87279eca991043c347dfdfda71b4e063023aec;hp=5ecf343ab185335ebe8dbd44845fcf529e591325;hpb=d343ffbde53ba2a6f39683465b3680e78e587992;p=ardour.git

diff --git a/gtk2_ardour/stereo_panner.h b/gtk2_ardour/stereo_panner.h
index 5ecf343ab1..f1e1025d76 100644
--- a/gtk2_ardour/stereo_panner.h
+++ b/gtk2_ardour/stereo_panner.h
@@ -21,7 +21,7 @@
 #define __gtk_ardour_stereo_panner_h__
 
 #include "pbd/signals.h"
-#include "gtkmm2ext/binding_proxy.h"
+#include "widgets/binding_proxy.h"
 #include "panner_interface.h"
 
 namespace ARDOUR {
@@ -29,80 +29,86 @@ namespace ARDOUR {
 }
 
 namespace PBD {
-        class Controllable;
+	class Controllable;
 }
 
 namespace ARDOUR {
-        class Panner;
+	class Panner;
 }
 
 class StereoPanner : public PannerInterface
 {
-  public:
+public:
 	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;
 	sigc::signal<void> StartWidthGesture;
 	sigc::signal<void> StopWidthGesture;
 
-  protected:
+protected:
 	bool on_expose_event (GdkEventExpose*);
 	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:
+	boost::weak_ptr<PBD::Controllable> proxy_controllable () const
+	{
+		return boost::weak_ptr<PBD::Controllable> (position_binder.get_controllable());
+	}
+
+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 connections;
-        bool dragging;
-        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;
+
+	ArdourWidgets::BindingProxy position_binder;
+	ArdourWidgets::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 ();
 };
 
 #endif /* __gtk_ardour_stereo_panner_h__ */