Move a few declarations to first use.

[ardour.git] / gtk2_ardour / stereo_panner.h

diff --git a/gtk2_ardour/stereo_panner.h b/gtk2_ardour/stereo_panner.h
index 312be4ec657bf92e88bbf86b769c430bce90dafa..8d76442724ef89dbb7c9db6425e09ef7d6b57476 100644 (file)
--- a/gtk2_ardour/stereo_panner.h
+++ b/gtk2_ardour/stereo_panner.h
@@ -21,22 +21,28 @@
 #define __gtk_ardour_stereo_panner_h__
 
 #include "pbd/signals.h"
-
-#include <gtkmm/drawingarea.h>
-#include <boost/shared_ptr.hpp>
-
 #include "gtkmm2ext/binding_proxy.h"
+#include "panner_interface.h"
 
 namespace PBD {
         class Controllable;
 }
 
-class StereoPanner : public Gtk::DrawingArea
+namespace ARDOUR {
+        class Panner;
+}
+
+class StereoPanner : public PannerInterface
 {
   public:
-       StereoPanner (boost::shared_ptr<PBD::Controllable> pos, boost::shared_ptr<PBD::Controllable> width);
+       StereoPanner (boost::shared_ptr<ARDOUR::Panner>);
        ~StereoPanner ();
 
+       sigc::signal<void> StartPositionGesture;
+       sigc::signal<void> StopPositionGesture;
+       sigc::signal<void> StartWidthGesture;
+       sigc::signal<void> StopWidthGesture;
+
   protected:
        bool on_expose_event (GdkEventExpose*);
        bool on_button_press_event (GdkEventButton*);
@@ -44,9 +50,6 @@ class StereoPanner : public Gtk::DrawingArea
        bool on_motion_notify_event (GdkEventMotion*);
         bool on_scroll_event (GdkEventScroll*);
         bool on_key_press_event (GdkEventKey*);
-        bool on_key_release_event (GdkEventKey*);
-        bool on_enter_notify_event (GdkEventCrossing* ev);
-        bool on_leave_notify_event (GdkEventCrossing* ev);
 
   private:
         boost::shared_ptr<PBD::Controllable> position_control;
@@ -61,23 +64,20 @@ class StereoPanner : public Gtk::DrawingArea
         double accumulated_delta;
         bool detented;
 
-        Gtk::Window* drag_data_window;
-        Gtk::Label* drag_data_label;
-
         BindingProxy position_binder;
         BindingProxy width_binder;
 
-        void value_change ();
         void set_drag_data ();
 
-        struct ColorScheme { 
+        struct ColorScheme {
             uint32_t outline;
             uint32_t fill;
             uint32_t text;
             uint32_t background;
+            uint32_t rule;
         };
 
-        enum State { 
+        enum State {
                 Normal,
                 Mono,
                 Inverted
@@ -86,7 +86,7 @@ class StereoPanner : public Gtk::DrawingArea
         static ColorScheme colors[3];
         static void set_colors ();
         static bool have_colors;
-        static PBD::Signal0<void> color_change;
+       void color_handler ();
 };
 
 #endif /* __gtk_ardour_stereo_panner_h__ */