amend to 930fce

[ardour.git] / gtk2_ardour / mono_panner.h

diff --git a/gtk2_ardour/mono_panner.h b/gtk2_ardour/mono_panner.h
index 411fadc688ba2f690a02f777777c8882b7b3dddc..1c387ad32cab50ed7c364e49fc672eab998a7042 100644 (file)
--- a/gtk2_ardour/mono_panner.h
+++ b/gtk2_ardour/mono_panner.h
@@ -22,19 +22,20 @@
 
 #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 MonoPanner : public Gtk::DrawingArea
+class MonoPanner : public PannerInterface
 {
   public:
-       MonoPanner (boost::shared_ptr<PBD::Controllable> pos);
+       MonoPanner (boost::shared_ptr<ARDOUR::Panner>);
        ~MonoPanner ();
 
         boost::shared_ptr<PBD::Controllable> get_controllable() const { return position_control; }
@@ -49,28 +50,22 @@ class MonoPanner : 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:
+       PannerEditor* editor ();
+       
         boost::shared_ptr<PBD::Controllable> position_control;
         PBD::ScopedConnectionList connections;
-        bool dragging;
         int drag_start_x;
         int last_drag_x;
         double accumulated_delta;
         bool detented;
 
-        Gtk::Window* drag_data_window;
-        Gtk::Label* drag_data_label;
-
         BindingProxy position_binder;
 
-        void value_change ();
-        void set_drag_data ();
+        void set_tooltip ();
 
-        struct ColorScheme { 
+        struct ColorScheme {
             uint32_t outline;
             uint32_t fill;
             uint32_t text;
@@ -79,10 +74,12 @@ class MonoPanner : public Gtk::DrawingArea
             uint32_t pos_fill;
         };
 
+       bool _dragging;
+
         static ColorScheme colors;
         static void set_colors ();
         static bool have_colors;
-        void color_handler ();
+       void color_handler ();
 };
 
 #endif /* __gtk_ardour_mono_panner_h__ */