Fix some bugs I introduced with the last commit.

[ardour.git] / gtk2_ardour / panner2d.h

diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h
index e1572c11b25a271b8a6dda8d353e29099b593cf0..881638856f9f8ee5279b88bc0d28a310905e0fd4 100644 (file)
--- a/gtk2_ardour/panner2d.h
+++ b/gtk2_ardour/panner2d.h
@@ -34,8 +34,10 @@
 
 #include "pbd/cartesian.h"
 
+#include "ardour_window.h"
+
 namespace ARDOUR {
-       class Panner;
+       class PannerShell;
 }
 
 namespace Gtk {
@@ -52,109 +54,116 @@ class Panner2dWindow;
 class Panner2d : public Gtk::DrawingArea
 {
   public:
-       Panner2d (boost::shared_ptr<ARDOUR::Panner>, int32_t height);
+       Panner2d (boost::shared_ptr<ARDOUR::PannerShell>, int32_t height);
        ~Panner2d ();
 
        void allow_target_motion (bool);
 
-       int  add_target (const PBD::AngularVector&);
-       int  add_puck (const char* text, const PBD::AngularVector&);
-       void move_puck (int which, const PBD::AngularVector&);
+       int  add_speaker (const PBD::AngularVector&);
+       int  add_signal (const char* text, const PBD::AngularVector&);
+       void move_signal (int which, const PBD::AngularVector&);
        void reset (uint32_t n_inputs);
 
-       boost::shared_ptr<ARDOUR::Panner> get_panner() const { return panner; }
+       boost::shared_ptr<ARDOUR::PannerShell> get_panner_shell() const { return panner_shell; }
 
        sigc::signal<void,int> PuckMoved;
        sigc::signal<void,int> TargetMoved;
 
-        void cart_to_gtk (PBD::CartesianVector&) const;
-        void gtk_to_cart (PBD::CartesianVector&) const;
+       void cart_to_gtk (PBD::CartesianVector&) const;
+       void gtk_to_cart (PBD::CartesianVector&) const;
 
   protected:
        bool on_expose_event (GdkEventExpose *);
        bool on_button_press_event (GdkEventButton *);
        bool on_button_release_event (GdkEventButton *);
        bool on_motion_notify_event (GdkEventMotion *);
+       bool on_scroll_event (GdkEventScroll *);
        void on_size_allocate (Gtk::Allocation& alloc);
 
   private:
        class Target {
-          public:
-                PBD::AngularVector position;
-                bool visible;
-                std::string text;
-                
-                Target (const PBD::AngularVector&, const char* txt = 0);
-                ~Target ();
-                
-                void set_text (const char*);
-                void set_selected (bool yn) {
-                        _selected = yn;
-                }
-                bool selected() const { 
-                        return _selected;
-                }
-                
-          private:
-                bool _selected;
+       public:
+               PBD::AngularVector position;
+               bool visible;
+               std::string text;
+
+               Target (const PBD::AngularVector&, const char* txt = 0);
+               ~Target ();
+
+               void set_text (const char*);
+               void set_selected (bool yn) {
+                       _selected = yn;
+               }
+               bool selected() const {
+                       return _selected;
+               }
+
+       private:
+               bool _selected;
        };
 
-       boost::shared_ptr<ARDOUR::Panner> panner;
+       boost::shared_ptr<ARDOUR::PannerShell> panner_shell;
        Glib::RefPtr<Pango::Layout> layout;
 
        typedef std::vector<Target*> Targets;
-       Targets targets;
-       Targets pucks;
+       Targets speakers;
+       Targets signals;
+        Target  position;
 
        Target *drag_target;
        int     drag_x;
        int     drag_y;
-       int     drag_index;
-       bool    allow_target;
+       bool    allow_speaker_motion;
        int     width;
        int     height;
-
-       bool bypassflag;
+        double  radius;
+        double  border;
+        double  hoffset;
+        double  voffset;
+        double  last_width;
+       bool    did_move;
 
        gint compute_x (float);
        gint compute_y (float);
 
-       Target *find_closest_object (gdouble x, gdouble y, int& which) const;
+       Target *find_closest_object (gdouble x, gdouble y, bool& is_signal);
 
        gint handle_motion (gint, gint, GdkModifierType);
 
        void toggle_bypass ();
        void handle_state_change ();
        void handle_position_change ();
+        void label_signals ();
 
-       PBD::ScopedConnection state_connection;
-       PBD::ScopedConnection change_connection;
+       PBD::ScopedConnectionList connections;
 
-        /* cartesian coordinates in GTK units ; adjust to same but on a circle of radius 1.0
-           and centered in the middle of our area
-        */
-        void clamp_to_circle (double& x, double& y);
+       /* cartesian coordinates in GTK units ; adjust to same but on a circle of radius 1.0
+          and centered in the middle of our area
+       */
+       void clamp_to_circle (double& x, double& y);
 };
 
-class Panner2dWindow : public Gtk::Window
+class Panner2dWindow : public ArdourWindow
 {
   public:
-       Panner2dWindow (boost::shared_ptr<ARDOUR::Panner>, int32_t height, uint32_t inputs);
+       Panner2dWindow (boost::shared_ptr<ARDOUR::PannerShell>, int32_t height, uint32_t inputs);
 
        void reset (uint32_t n_inputs);
 
   private:
        Panner2d widget;
 
-       Gtk::HBox   hpacker;
-       Gtk::VBox   button_box;
-       Gtk::Button reset_button;
+       Gtk::HBox         hpacker;
+       Gtk::VBox         button_box;
        Gtk::ToggleButton bypass_button;
-       Gtk::ToggleButton mute_button;
-       Gtk::VBox   spinner_box;
-       Gtk::VBox   left_side;
+       Gtk::VBox         spinner_box;
+       Gtk::VBox         left_side;
 
        std::vector<Gtk::SpinButton*> spinners;
+
+        void bypass_toggled ();
+        bool on_key_press_event (GdkEventKey*);
+        bool on_key_release_event (GdkEventKey*);
 };
 
 #endif /* __ardour_panner_2d_h__ */