X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fpanner2d.h;h=881638856f9f8ee5279b88bc0d28a310905e0fd4;hb=c9c94ca1c247adfc1a78fda0eda185a9a7589696;hp=1abac7fe5a6cc72b2b4ca12ef3db50e61444b66f;hpb=7183242b8c8d9296f94a035fb66b1eae06fd3496;p=ardour.git

diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h
index 1abac7fe5a..881638856f 100644
--- a/gtk2_ardour/panner2d.h
+++ b/gtk2_ardour/panner2d.h
@@ -22,7 +22,6 @@
 
 #include <sys/types.h>
 #include <map>
-#include <string>
 #include <vector>
 
 #include <glibmm/refptr.h>
@@ -33,11 +32,12 @@
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/adjustment.h>
 
-using std::map;
-using std::string;
+#include "pbd/cartesian.h"
+
+#include "ardour_window.h"
 
 namespace ARDOUR {
-	class Panner;
+	class PannerShell;
 }
 
 namespace Gtk {
@@ -54,105 +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_x_motion(bool);
-	void allow_y_motion(bool);
+
 	void allow_target_motion (bool);
 
-	void hide_puck (int which);
-	void show_puck (int which);
-	int  add_target (float x, float y);
-	int  add_puck (const char* text, float x, float y);
-	void hide_target (int);
-	void show_target (int);
-	void remove_target (int);
-	void drop_targets ();
-	void drop_pucks ();
-	void move_target (int, float x, float y);
-	void move_puck (int, float x, float y);
+	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);
 
-	Gtk::Adjustment& azimuth (uint32_t which);
+	boost::shared_ptr<ARDOUR::PannerShell> get_panner_shell() const { return panner_shell; }
 
-	boost::shared_ptr<ARDOUR::Panner> get_panner() const { return panner; }
-	
 	sigc::signal<void,int> PuckMoved;
 	sigc::signal<void,int> TargetMoved;
 
+	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:
-	struct Target {
-	    Gtk::Adjustment x;
-	    Gtk::Adjustment y;
-	    Gtk::Adjustment azimuth;
-	    bool visible;
-	    char* text;
-
-	    Target (float xa, float ya, const char* txt = 0);
-	    ~Target ();
-
-	    void set_text (const char*);
+	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;
 	};
 
-	boost::shared_ptr<ARDOUR::Panner> panner;
+	boost::shared_ptr<ARDOUR::PannerShell> panner_shell;
 	Glib::RefPtr<Pango::Layout> layout;
 
-	typedef std::map<int,Target *> Targets;
-	Targets targets;
-	Targets pucks;
+	typedef std::vector<Target*> Targets;
+	Targets speakers;
+	Targets signals;
+        Target  position;
 
 	Target *drag_target;
-	int drag_x;
-	int drag_y;
-	int     drag_index;
-	bool    drag_is_puck;
-	bool  allow_x;
-	bool  allow_y;
-	bool  allow_target;
-	int width;
-	int height;
-
-	bool bypassflag;
-	
+	int     drag_x;
+	int     drag_y;
+	bool    allow_speaker_motion;
+	int     width;
+	int     height;
+        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, bool& is_puck) 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::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);
 };
 
-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__ */