X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.h;h=95e1e6c688e565dbfbcf1a30657151c5ffa845f0;hb=4f3bddf7ef163c3106ba973123cbc657ebaf4b74;hp=45016597503cbc4074055e09fb21f543d5f611b7;hpb=3be16e8afbd891c0bfe7227158384ed0d127597f;p=ardour.git

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index 4501659750..95e1e6c688 100644
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -37,10 +37,12 @@
 
 class Panner2d;
 class PannerBar;
+class Panner2dWindow;
 
 namespace ARDOUR {
-	class IO;
 	class Session;
+	class Panner;
+	class Delivery;
 }
 namespace Gtkmm2ext {
 	class FastMeter;
@@ -57,7 +59,7 @@ class PannerUI : public Gtk::HBox
 	PannerUI (ARDOUR::Session&);
 	~PannerUI ();
 
-	virtual void set_io (boost::shared_ptr<ARDOUR::IO>);
+	virtual void set_panner (boost::shared_ptr<ARDOUR::Panner>);
 
 	void pan_changed (void *);
 
@@ -69,13 +71,13 @@ class PannerUI : public Gtk::HBox
 
 	void effective_pan_display ();
 
-	void set_meter_strip_name (string name);
+	void set_meter_strip_name (std::string name);
 	boost::shared_ptr<PBD::Controllable> get_controllable();
 
   private:
 	friend class MixerStrip;
 
-	boost::shared_ptr<ARDOUR::IO> _io;
+	boost::shared_ptr<ARDOUR::Panner> _panner;
 	ARDOUR::Session& _session;
 	std::vector<sigc::connection> connections;
 
@@ -84,7 +86,8 @@ class PannerUI : public Gtk::HBox
 
 	static const int pan_bar_height;
 
-	Panner2d*   panner;
+	Panner2d*       panner;
+	Panner2dWindow* big_window;
 
 	Gtk::VBox           pan_bar_packer;
 	Gtk::Adjustment	    hAdjustment;
@@ -112,12 +115,11 @@ class PannerUI : public Gtk::HBox
 
 	void panning_link_direction_clicked ();
 
-	vector<Gtk::Adjustment*> pan_adjustments;
-	vector<PannerBar*> pan_bars;
+	std::vector<Gtk::Adjustment*> pan_adjustments;
+	std::vector<PannerBar*> pan_bars;
 
 	void pan_adjustment_changed (uint32_t which);
 	void pan_value_changed (uint32_t which);
-	void pan_printer (char* buf, uint32_t, Gtk::Adjustment*);
 	void update_pan_bars (bool only_if_aplay);
 	void update_pan_linkage ();
 	void update_pan_state ();
@@ -140,7 +142,8 @@ class PannerUI : public Gtk::HBox
 	Gtk::CheckMenuItem* bypass_menu_item;
 	void build_pan_menu (uint32_t which);
 	void pan_mute (uint32_t which);
-	void pan_reset ();
+	void pan_reset (uint32_t);
+	void pan_reset_all ();
 	void pan_bypass_toggle ();
 
 	void pan_automation_state_changed();