X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.h;h=4ed8767fb1258f30e7ba964b059a9461eb8d1c62;hb=fddb3778120e25b3b8e8134084e260dac07c1365;hp=602164d7a941041f5c8050833523dbc9922f8168;hpb=64524c0ba40b9f69f06a395f8763615700244fda;p=ardour.git

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index 602164d7a9..4ed8767fb1 100644
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -33,6 +33,8 @@
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/slider_controller.h>
 
+#include "ardour/session_handle.h"
+
 #include "enums.h"
 
 class Panner2d;
@@ -40,8 +42,9 @@ class PannerBar;
 class Panner2dWindow;
 
 namespace ARDOUR {
-	class IO;
 	class Session;
+	class Panner;
+	class Delivery;
 }
 namespace Gtkmm2ext {
 	class FastMeter;
@@ -52,13 +55,13 @@ namespace Gtk {
 	class Menuitem;
 }
 
-class PannerUI : public Gtk::HBox
+class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
   public:
-	PannerUI (ARDOUR::Session&);
+	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 *);
 
@@ -73,19 +76,23 @@ class PannerUI : public Gtk::HBox
 	void set_meter_strip_name (std::string name);
 	boost::shared_ptr<PBD::Controllable> get_controllable();
 
+	void set_mono (bool);
+
   private:
 	friend class MixerStrip;
 
-	boost::shared_ptr<ARDOUR::IO> _io;
-	ARDOUR::Session& _session;
-	std::vector<sigc::connection> connections;
+	boost::shared_ptr<ARDOUR::Panner> _panner;
+	PBD::ScopedConnectionList connections;
+	PBD::ScopedConnectionList _pan_control_connections;
 
 	bool ignore_toggle;
 	bool in_pan_update;
+	int _current_nouts;
+	int _current_npans;
 
 	static const int pan_bar_height;
 
-	Panner2d*       panner;
+	Panner2d*       twod_panner; ///< 2D panner, or 0
 	Panner2dWindow* big_window;
 
 	Gtk::VBox           pan_bar_packer;
@@ -126,7 +133,7 @@ class PannerUI : public Gtk::HBox
 	void build_astyle_menu ();
 
 	void panner_changed ();
-	
+
 	void hide_pans ();
 
 	void panner_moved (int which);
@@ -137,6 +144,8 @@ class PannerUI : public Gtk::HBox
 
 	bool pan_button_event (GdkEventButton*, uint32_t which);
 
+	void connect_to_pan_control (uint32_t);
+
 	Gtk::Menu* pan_menu;
 	Gtk::CheckMenuItem* bypass_menu_item;
 	void build_pan_menu (uint32_t which);