X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner2d.h;h=f3077187aba4b38c3431a1c1e3a36d467a3aba6b;hb=44a3f042a7a878af45ae893e0361d6a8be315da4;hp=6580b9966834417efcd444a2b4d201b107192622;hpb=96cc6c3410c927ca14f50a52487e304967efdbf3;p=ardour.git

diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h
index 6580b99668..f3077187ab 100644
--- 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 {
@@ -44,118 +46,148 @@ namespace Gtk {
 }
 
 namespace Pango {
-	class Layout;
+	class Container;
 }
 
 class Panner2dWindow;
 
 class Panner2d : public Gtk::DrawingArea
 {
-  public:
-	Panner2d (boost::shared_ptr<ARDOUR::Panner>, int32_t height);
+	public:
+	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);
+	void set_send_drawing_mode (bool);
 
-	boost::shared_ptr<ARDOUR::Panner> get_panner() const { return panner; }
-
-	sigc::signal<void,int> PuckMoved;
-	sigc::signal<void,int> TargetMoved;
+	boost::shared_ptr<ARDOUR::PannerShell> get_panner_shell() const { return panner_shell; }
 
 	void cart_to_gtk (PBD::CartesianVector&) const;
 	void gtk_to_cart (PBD::CartesianVector&) const;
 
-  protected:
+	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:
+	private:
 	class Target {
-	public:
+		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 { 
+		bool selected() const {
 			return _selected;
 		}
-                
-	private:
+
+		private:
 		bool _selected;
 	};
 
-	boost::shared_ptr<ARDOUR::Panner> panner;
+	struct ColorScheme {
+		uint32_t background;
+		uint32_t crosshairs;
+		uint32_t signalcircle_border;
+		uint32_t signalcircle;
+		uint32_t diffusion;
+		uint32_t diffusion_inv;
+		uint32_t pos_outline;
+		uint32_t pos_fill;
+		uint32_t signal_outline;
+		uint32_t signal_fill;
+		uint32_t speaker_fill;
+		uint32_t text;
+	};
+
+	static ColorScheme colors;
+	static void set_colors ();
+	static bool have_colors;
+	void color_handler ();
+
+	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;
 	int     width;
 	int     height;
-        int     dimen; 
-
-	bool bypassflag;
-
-	gint compute_x (float);
-	gint compute_y (float);
+	double  radius;
+	double  border;
+	double  hoffset;
+	double  voffset;
+	double  last_width;
+	bool    did_move;
+	bool    have_elevation;
+	bool    _send_mode;
 
-	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 panshell_connections;
+	PBD::ScopedConnectionList panner_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);
+	void sphere_project (double& x, double& y, double& z);
 };
 
-class Panner2dWindow : public Gtk::Window
+class Panner2dWindow : public ArdourWindow
 {
-  public:
-	Panner2dWindow (boost::shared_ptr<ARDOUR::Panner>, int32_t height, uint32_t inputs);
+	public:
+	Panner2dWindow (boost::shared_ptr<ARDOUR::PannerShell>, int32_t height, uint32_t inputs);
 
 	void reset (uint32_t n_inputs);
 
-  private:
+	private:
 	Panner2d widget;
 
 	Gtk::HBox         hpacker;
 	Gtk::VBox         button_box;
-	Gtk::Button       reset_button;
 	Gtk::ToggleButton bypass_button;
-	Gtk::ToggleButton mute_button;
 	Gtk::VBox         spinner_box;
 	Gtk::VBox         left_side;
 
-	std::vector<Gtk::SpinButton*> spinners;
+	Gtk::Adjustment   width_adjustment;
+	Gtk::SpinButton   width_spinner;
+
+	PBD::ScopedConnectionList panshell_connections;
+	PBD::ScopedConnectionList panvalue_connections;
+	void set_bypassed();
+	void set_width();
+
+	void pannable_handler ();
+	void bypass_toggled ();
+	void width_changed ();
+	bool on_key_press_event (GdkEventKey*);
+	bool on_key_release_event (GdkEventKey*);
 };
 
 #endif /* __ardour_panner_2d_h__ */