X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner2d.h;h=91f4851746d1b0233934cd7765de881c4fe56e19;hb=1474b10d39873538f93a466517f518c5013d1ac3;hp=d53e50ae08da88ffad6cbd3f37fa59361bd58b5f;hpb=e1957a31666ad1a23fa0df3f32e2d6910a3abe64;p=ardour.git

diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h
index d53e50ae08..91f4851746 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,13 +22,15 @@
 
 #include <sys/types.h>
 #include <map>
-#include <string>
+#include <vector>
 
 #include <glibmm/refptr.h>
 #include <gtkmm/drawingarea.h>
-
-using std::map;
-using std::string;
+#include <gtkmm/window.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/spinbutton.h>
+#include <gtkmm/adjustment.h>
 
 namespace ARDOUR {
 	class Panner;
@@ -44,14 +45,13 @@ namespace Pango {
 	class Layout;
 }
 
+class Panner2dWindow;
+
 class Panner2d : public Gtk::DrawingArea
 {
   public:
-	Panner2d (ARDOUR::Panner&, int32_t height);
+	Panner2d (boost::shared_ptr<ARDOUR::Panner>, 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);
@@ -70,6 +70,10 @@ class Panner2d : public Gtk::DrawingArea
 	void move_puck (int, float x, float y);
 	void reset (uint32_t n_inputs);
 
+	Gtk::Adjustment& azimuth (uint32_t which);
+
+	boost::shared_ptr<ARDOUR::Panner> get_panner() const { return panner; }
+
 	sigc::signal<void,int> PuckMoved;
 	sigc::signal<void,int> TargetMoved;
 
@@ -82,19 +86,19 @@ class Panner2d : public Gtk::DrawingArea
 
   private:
 	struct Target {
-	    float x;
-	    float y;
+	    Gtk::Adjustment x;
+	    Gtk::Adjustment y;
+	    Gtk::Adjustment azimuth;
 	    bool visible;
 	    char* text;
-	    size_t textlen;
 
 	    Target (float xa, float ya, const char* txt = 0);
 	    ~Target ();
+
+	    void set_text (const char*);
 	};
 
-	ARDOUR::Panner& panner;
-	Gtk::Menu* context_menu;
-	Gtk::CheckMenuItem* bypass_menu_item;
+	boost::shared_ptr<ARDOUR::Panner> panner;
 	Glib::RefPtr<Pango::Layout> layout;
 
 	typedef std::map<int,Target *> Targets;
@@ -102,6 +106,8 @@ class Panner2d : public Gtk::DrawingArea
 	Targets pucks;
 
 	Target *drag_target;
+	int drag_x;
+	int drag_y;
 	int     drag_index;
 	bool    drag_is_puck;
 	bool  allow_x;
@@ -111,7 +117,7 @@ class Panner2d : public Gtk::DrawingArea
 	int height;
 
 	bool bypassflag;
-	
+
 	gint compute_x (float);
 	gint compute_y (float);
 
@@ -120,8 +126,29 @@ class Panner2d : public Gtk::DrawingArea
 	gint handle_motion (gint, gint, GdkModifierType);
 
 	void toggle_bypass ();
-	void show_context_menu ();
 	void handle_state_change ();
+	void handle_position_change ();
+};
+
+class Panner2dWindow : public Gtk::Window
+{
+  public:
+	Panner2dWindow (boost::shared_ptr<ARDOUR::Panner>, 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::ToggleButton bypass_button;
+	Gtk::ToggleButton mute_button;
+	Gtk::VBox   spinner_box;
+	Gtk::VBox   left_side;
+
+	std::vector<Gtk::SpinButton*> spinners;
 };
 
 #endif /* __ardour_panner_2d_h__ */