X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstereo_panner.h;h=ba9823214691c920157ae789d69cf27e0894d0c6;hb=ddc4824d9265c7eaa3b88bd469bd795272c7baad;hp=52abb3068752fa6df14fcd9e567883f1045c012e;hpb=7d252dbbb9f6698619e6592025824d81a83cffba;p=ardour.git

diff --git a/gtk2_ardour/stereo_panner.h b/gtk2_ardour/stereo_panner.h
index 52abb30687..ba98232146 100644
--- a/gtk2_ardour/stereo_panner.h
+++ b/gtk2_ardour/stereo_panner.h
@@ -21,22 +21,35 @@
 #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 ARDOUR {
+	class PannerShell;
+}
 
 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::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;
+	sigc::signal<void> StopWidthGesture;
+
   protected:
 	bool on_expose_event (GdkEventExpose*);
 	bool on_button_press_event (GdkEventButton*);
@@ -44,15 +57,15 @@ 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:
+	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;
@@ -61,16 +74,12 @@ 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 { 
+        struct ColorScheme {
             uint32_t outline;
             uint32_t fill;
             uint32_t text;
@@ -78,16 +87,23 @@ class StereoPanner : public Gtk::DrawingArea
             uint32_t rule;
         };
 
-        enum State { 
+        enum State {
                 Normal,
                 Mono,
                 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 color_handler ();
+	void bypass_handler ();
+	void pannable_handler ();
 };
 
 #endif /* __gtk_ardour_stereo_panner_h__ */