X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.h;h=0c0b7cfc66f728b5e2418a61630b8fc26e2f2cea;hb=af2ee3c8564c7d60cadb130b8c7ad1f4cddd2216;hp=e64419b4575b66157fe11d38fcaee42ac39e00ee;hpb=15b5fce90480490455237da917167b0bcb5ce946;p=ardour.git

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index e64419b457..0c0b7cfc66 100644
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -37,7 +37,6 @@
 #include "enums.h"
 
 class Panner2d;
-class PannerBar;
 class Panner2dWindow;
 class StereoPanner;
 class MonoPanner;
@@ -45,6 +44,7 @@ class MonoPanner;
 namespace ARDOUR {
 	class Session;
 	class Panner;
+	class PannerShell;
 	class Delivery;
         class AutomationControl;
 }
@@ -64,29 +64,31 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	PannerUI (ARDOUR::Session*);
 	~PannerUI ();
 
-	virtual void set_panner (boost::shared_ptr<ARDOUR::Panner>);
+	virtual void set_panner (boost::shared_ptr<ARDOUR::PannerShell>, boost::shared_ptr<ARDOUR::Panner>);
 
-	void panner_changed (void *);
+	void panshell_changed ();
 
 	void update_pan_sensitive ();
 	void update_gain_sensitive ();
 
 	void set_width (Width);
 	void setup_pan ();
+	void set_available_panners(std::map<std::string,std::string>);
+	void set_send_drawing_mode (bool);
 
 	void effective_pan_display ();
 
 	void set_meter_strip_name (std::string name);
-	boost::shared_ptr<PBD::Controllable> get_controllable();
 
-	void set_mono (bool);
 	void on_size_allocate (Gtk::Allocation &);
-        
+
 	static void setup_slider_pix ();
 
   private:
 	friend class MixerStrip;
+	friend class SendUI;
 
+	boost::shared_ptr<ARDOUR::PannerShell> _panshell;
 	boost::shared_ptr<ARDOUR::Panner> _panner;
 	PBD::ScopedConnectionList connections;
 	PBD::ScopedConnectionList _pan_control_connections;
@@ -95,8 +97,8 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	bool in_pan_update;
 	int _current_nouts;
 	int _current_nins;
-
-	static const int pan_bar_height;
+	std::string _current_uri;
+	bool _send_mode;
 
 	Panner2d*       twod_panner; ///< 2D panner, or 0
 	Panner2dWindow* big_window;
@@ -107,6 +109,8 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	Width              _width;
 
         StereoPanner*  _stereo_panner;
+	MonoPanner*    _mono_panner;
+
         bool _ignore_width_change;
         bool _ignore_position_change;
         void width_adjusted ();
@@ -120,10 +124,7 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	Gtk::Button pan_automation_style_button;
 	Gtk::ToggleButton pan_automation_state_button;
 
-	std::vector<MonoPanner*> pan_bars;
-
 	void pan_value_changed (uint32_t which);
-	void update_pan_state ();
 	void build_astate_menu ();
 	void build_astyle_menu ();
 
@@ -142,6 +143,8 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	void build_pan_menu ();
 	void pan_reset ();
 	void pan_bypass_toggle ();
+	void pan_edit ();
+	void pan_set_custom_type (std::string type);
 
 	void pan_automation_state_changed();
 	void pan_automation_style_changed();
@@ -159,6 +162,9 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
         void start_touch (boost::weak_ptr<ARDOUR::AutomationControl>);
         void stop_touch (boost::weak_ptr<ARDOUR::AutomationControl>);
+
+	std::map<std::string,std::string> _panner_list;
+	bool _suspend_menu_callbacks;
 };
 
 #endif /* __ardour_gtk_panner_ui_h__ */