X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.h;h=e8a9eac414ef115f2bc0403c46840ecb224034d4;hb=4336bb25d739cd007811ccd0298a15acc5e20787;hp=6be92f9c5a13356a4310e8abcffb58421273c166;hpb=66e91bafd2b72100f0ad2cdcc4d39818bd766ca3;p=ardour.git

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index 6be92f9c5a..e8a9eac414 100644
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -33,16 +33,22 @@
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/slider_controller.h>
 
+#include "ardour/session_handle.h"
+
 #include "enums.h"
 
 class Panner2d;
 class PannerBar;
 class Panner2dWindow;
+class StereoPanner;
 
 namespace ARDOUR {
-	class IO;
 	class Session;
+	class Panner;
+	class Delivery;
+        class AutomationControl;
 }
+
 namespace Gtkmm2ext {
 	class FastMeter;
 }
@@ -52,15 +58,15 @@ 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 *);
+	void panner_changed (void *);
 
 	void update_pan_sensitive ();
 	void update_gain_sensitive ();
@@ -70,22 +76,29 @@ 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();
 
+	void set_mono (bool);
+	void on_size_allocate (Gtk::Allocation &);
+        
+	static void setup_slider_pix ();
+
   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;
@@ -97,8 +110,17 @@ class PannerUI : public Gtk::HBox
 	Gtk::EventBox       panning_down;
 	Gtk::Arrow          panning_down_arrow;
 	Gtk::VBox           pan_vbox;
+        Gtk::VBox           poswidth_box;
 	Width              _width;
 
+        StereoPanner*  _stereo_panner;
+        bool _ignore_width_change;
+        bool _ignore_position_change;
+        void width_adjusted ();
+        void show_width ();
+        void position_adjusted ();
+        void show_position ();
+
 	Gtk::ToggleButton   panning_link_button;
 	Gtk::Button         panning_link_direction_button;
 	Gtk::HBox           panning_link_box;
@@ -114,20 +136,17 @@ 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 ();
 	void build_astate_menu ();
 	void build_astyle_menu ();
 
-	void panner_changed ();
-	
 	void hide_pans ();
 
 	void panner_moved (int which);
@@ -138,11 +157,14 @@ 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);
 	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();
@@ -158,6 +180,13 @@ class PannerUI : public Gtk::HBox
 	std::string astyle_string (ARDOUR::AutoStyle);
 	std::string short_astyle_string (ARDOUR::AutoStyle);
 	std::string _astyle_string (ARDOUR::AutoStyle, bool);
+
+        void start_touch (boost::weak_ptr<ARDOUR::AutomationControl>);
+        void stop_touch (boost::weak_ptr<ARDOUR::AutomationControl>);
+
+	void bar_spinner_activate (bool);
+	/** true if any of our PannerBars are currently using a SpinButton to modify value */
+	bool _bar_spinner_active;
 };
 
 #endif /* __ardour_gtk_panner_ui_h__ */