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

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index de889471aa..e8a9eac414 100644
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -40,12 +40,15 @@
 class Panner2d;
 class PannerBar;
 class Panner2dWindow;
+class StereoPanner;
 
 namespace ARDOUR {
 	class Session;
 	class Panner;
 	class Delivery;
+        class AutomationControl;
 }
+
 namespace Gtkmm2ext {
 	class FastMeter;
 }
@@ -63,7 +66,7 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 	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 ();
@@ -77,12 +80,16 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	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::Panner> _panner;
 	PBD::ScopedConnectionList connections;
+	PBD::ScopedConnectionList _pan_control_connections;
 
 	bool ignore_toggle;
 	bool in_pan_update;
@@ -91,7 +98,7 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 	static const int pan_bar_height;
 
-	Panner2d*       panner;
+	Panner2d*       twod_panner; ///< 2D panner, or 0
 	Panner2dWindow* big_window;
 
 	Gtk::VBox           pan_bar_packer;
@@ -103,8 +110,17 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	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;
@@ -131,8 +147,6 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	void build_astate_menu ();
 	void build_astyle_menu ();
 
-	void panner_changed ();
-
 	void hide_pans ();
 
 	void panner_moved (int which);
@@ -143,6 +157,8 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 	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);
@@ -164,6 +180,13 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	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__ */