X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner2d.h;h=881638856f9f8ee5279b88bc0d28a310905e0fd4;hb=b4d7120a58cb3fc2a49542acab868e0eb0790864;hp=d1bbfb9add85a4b9b16fa67583cd613b29eda93a;hpb=a0663fbd278f4514ba26c4a4c0e2aa5ec2964dd9;p=ardour.git

diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h
index d1bbfb9add..881638856f 100644
--- a/gtk2_ardour/panner2d.h
+++ b/gtk2_ardour/panner2d.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_panner_2d_h__
@@ -23,93 +22,148 @@
 
 #include <sys/types.h>
 #include <map>
-#include <string>
-#include <gtkmm.h>
+#include <vector>
 
-using std::map;
-using std::string;
+#include <glibmm/refptr.h>
+#include <gtkmm/drawingarea.h>
+#include <gtkmm/window.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/spinbutton.h>
+#include <gtkmm/adjustment.h>
+
+#include "pbd/cartesian.h"
+
+#include "ardour_window.h"
 
 namespace ARDOUR {
-	class Panner;
+	class PannerShell;
+}
+
+namespace Gtk {
+	class Menu;
+	class CheckMenuItem;
+}
+
+namespace Pango {
+	class Layout;
 }
 
+class Panner2dWindow;
+
 class Panner2d : public Gtk::DrawingArea
 {
   public:
-	Panner2d (ARDOUR::Panner&, int32_t width, int32_t height);
+	Panner2d (boost::shared_ptr<ARDOUR::PannerShell>, int32_t height);
 	~Panner2d ();
-	
-	int puck_position (int which_puck, float& x, float& y);
-	int target_position (int which_target, float& x, float& y);
 
-	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);
 
+	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;
+
   protected:
 	bool on_expose_event (GdkEventExpose *);
 	bool on_button_press_event (GdkEventButton *);
 	bool on_button_release_event (GdkEventButton *);
 	bool on_motion_notify_event (GdkEventMotion *);
-	void on_size_allocate (Gtk::Allocation alloc);
+	bool on_scroll_event (GdkEventScroll *);
+	void on_size_allocate (Gtk::Allocation& alloc);
 
   private:
-	struct Target {
-	    float x;
-	    float y;
-	    bool visible;
-	    char* text;
-	    size_t textlen;
-
-	    Target (float xa, float ya, const char* txt = 0);
-	    ~Target ();
+	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;
 	};
 
-	ARDOUR::Panner& panner;
-	Gtk::Menu* context_menu;
-	Gtk::CheckMenuItem* bypass_menu_item;
+	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_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 show_context_menu ();
 	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 ArdourWindow
+{
+  public:
+	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::ToggleButton bypass_button;
+	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__ */