add red-boxes to meter-marks and fix Nordic scale color

[ardour.git] / gtk2_ardour / stereo_panner.h

diff --git a/gtk2_ardour/stereo_panner.h b/gtk2_ardour/stereo_panner.h
index f2b04f1af7627d3af7cf52dc0d8c46fa84a4ff23..8b62b7d82a412bb41971914215817e52ecdb331b 100644 (file)
--- a/gtk2_ardour/stereo_panner.h
+++ b/gtk2_ardour/stereo_panner.h
@@ -21,11 +21,8 @@
 #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;
@@ -35,12 +32,15 @@ namespace ARDOUR {
         class Panner;
 }
 
-class StereoPanner : public Gtk::DrawingArea
+class StereoPanner : public PannerInterface
 {
   public:
        StereoPanner (boost::shared_ptr<ARDOUR::Panner>);
        ~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;
@@ -53,12 +53,10 @@ 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<ARDOUR::Panner> _panner;
+       PannerEditor* editor ();
+                  
         boost::shared_ptr<PBD::Controllable> position_control;
         boost::shared_ptr<PBD::Controllable> width_control;
         PBD::ScopedConnectionList connections;
@@ -71,14 +69,10 @@ 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 ();
+        void set_tooltip ();
 
         struct ColorScheme {
             uint32_t outline;
@@ -94,10 +88,12 @@ class StereoPanner : public Gtk::DrawingArea
                 Inverted
         };
 
+       bool _dragging;
+
         static ColorScheme colors[3];
         static void set_colors ();
         static bool have_colors;
-        void color_handler ();
+       void color_handler ();
 };
 
 #endif /* __gtk_ardour_stereo_panner_h__ */