X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstereo_panner.h;h=ba9823214691c920157ae789d69cf27e0894d0c6;hb=5583929a3491075df4e1862579e8df7318dc7370;hp=19fa0c056ec892fc20504c6ab66d3324ddb92c4b;hpb=46e448252f74ce35f37a1a41bb3ebe0f0312cd5d;p=ardour.git

diff --git a/gtk2_ardour/stereo_panner.h b/gtk2_ardour/stereo_panner.h
index 19fa0c056e..ba98232146 100644
--- a/gtk2_ardour/stereo_panner.h
+++ b/gtk2_ardour/stereo_panner.h
@@ -24,6 +24,10 @@
 #include "gtkmm2ext/binding_proxy.h"
 #include "panner_interface.h"
 
+namespace ARDOUR {
+	class PannerShell;
+}
+
 namespace PBD {
         class Controllable;
 }
@@ -35,7 +39,7 @@ namespace ARDOUR {
 class StereoPanner : public PannerInterface
 {
   public:
-	StereoPanner (boost::shared_ptr<ARDOUR::Panner>);
+	StereoPanner (boost::shared_ptr<ARDOUR::PannerShell>);
 	~StereoPanner ();
 
         boost::shared_ptr<PBD::Controllable> get_position_controllable() const { return position_control; }
@@ -56,11 +60,12 @@ class StereoPanner : public PannerInterface
 
   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;
+        PBD::ScopedConnectionList panvalue_connections;
+        PBD::ScopedConnectionList panshell_connections;
         bool dragging_position;
         bool dragging_left;
         bool dragging_right;
@@ -72,7 +77,7 @@ class StereoPanner : public PannerInterface
         BindingProxy position_binder;
         BindingProxy width_binder;
 
-        void set_drag_data ();
+        void set_tooltip ();
 
         struct ColorScheme {
             uint32_t outline;
@@ -88,10 +93,17 @@ class StereoPanner : public PannerInterface
                 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;
 	void color_handler ();
+	void bypass_handler ();
+	void pannable_handler ();
 };
 
 #endif /* __gtk_ardour_stereo_panner_h__ */