Don't include program-name with <Option name="color-file" />

[ardour.git] / gtk2_ardour / stereo_panner.h

diff --git a/gtk2_ardour/stereo_panner.h b/gtk2_ardour/stereo_panner.h
index 8d76442724ef89dbb7c9db6425e09ef7d6b57476..ba9823214691c920157ae789d69cf27e0894d0c6 100644 (file)
--- 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,9 +39,12 @@ 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; }
+        boost::shared_ptr<PBD::Controllable> get_width_controllable() const { return width_control; }
+
        sigc::signal<void> StartPositionGesture;
        sigc::signal<void> StopPositionGesture;
        sigc::signal<void> StartWidthGesture;
@@ -52,10 +59,13 @@ class StereoPanner : 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;
         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;
@@ -67,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;
@@ -83,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__ */