X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmono_panner.h;h=4d5f1ffec0a64b7f547aca9cd6313ae0fc987812;hb=e495577f98ac8d4d0d429766f6b898501471db37;hp=ec47aa309d3eac9b06a80c1a56d283d49dbf8591;hpb=2adb3fb579068b5a278df2ac96d131fe5f40f169;p=ardour.git

diff --git a/gtk2_ardour/mono_panner.h b/gtk2_ardour/mono_panner.h
index ec47aa309d..4d5f1ffec0 100644
--- a/gtk2_ardour/mono_panner.h
+++ b/gtk2_ardour/mono_panner.h
@@ -28,6 +28,10 @@
 
 #include "panner_interface.h"
 
+namespace ARDOUR {
+	class PannerShell;
+}
+
 namespace PBD {
         class Controllable;
 }
@@ -35,7 +39,7 @@ namespace PBD {
 class MonoPanner : public PannerInterface
 {
   public:
-	MonoPanner (boost::shared_ptr<ARDOUR::Panner>);
+	MonoPanner (boost::shared_ptr<ARDOUR::PannerShell>);
 	~MonoPanner ();
 
         boost::shared_ptr<PBD::Controllable> get_controllable() const { return position_control; }
@@ -52,8 +56,12 @@ class MonoPanner : public PannerInterface
         bool on_key_press_event (GdkEventKey*);
 
   private:
+	PannerEditor* editor ();
+	boost::shared_ptr<ARDOUR::PannerShell> _panner_shell;
+	
         boost::shared_ptr<PBD::Controllable> position_control;
-        PBD::ScopedConnectionList connections;
+        PBD::ScopedConnectionList panvalue_connections;
+        PBD::ScopedConnectionList panshell_connections;
         int drag_start_x;
         int last_drag_x;
         double accumulated_delta;
@@ -61,7 +69,7 @@ class MonoPanner : public PannerInterface
 
         BindingProxy position_binder;
 
-        void set_drag_data ();
+        void set_tooltip ();
 
         struct ColorScheme {
             uint32_t outline;
@@ -72,10 +80,17 @@ class MonoPanner : public PannerInterface
             uint32_t pos_fill;
         };
 
+	bool _dragging;
+
+	static Pango::AttrList panner_font_attributes;
+	static bool have_font;
+
         static ColorScheme colors;
         static void set_colors ();
         static bool have_colors;
 	void color_handler ();
+	void bypass_handler ();
+	void pannable_handler ();
 };
 
 #endif /* __gtk_ardour_mono_panner_h__ */