X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.h;h=a18e22ec5630f36d936ab4d7a060ec14a2e632b5;hb=d0227fe5b7c30271cd2950a71d429cf03b0db2db;hp=a1558981f68df4b756efed8408c78f2045e81213;hpb=7b6b75f38ff6b34de3f70e36045498f227c1727d;p=ardour.git

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index a1558981f6..a18e22ec56 100644
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -24,7 +24,6 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/adjustment.h>
-#include <gtkmm/viewport.h>
 #include <gtkmm/eventbox.h>
 #include <gtkmm/arrow.h>
 #include <gtkmm/togglebutton.h>
@@ -38,12 +37,14 @@
 #include "enums.h"
 
 class Panner2d;
-class PannerBar;
 class Panner2dWindow;
+class StereoPanner;
+class MonoPanner;
 
 namespace ARDOUR {
 	class Session;
 	class Panner;
+	class PannerShell;
 	class Delivery;
         class AutomationControl;
 }
@@ -63,9 +64,9 @@ 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 pan_changed (void *);
+	void panshell_changed ();
 
 	void update_pan_sensitive ();
 	void update_gain_sensitive ();
@@ -78,11 +79,14 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	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::PannerShell> _panshell;
 	boost::shared_ptr<ARDOUR::Panner> _panner;
 	PBD::ScopedConnectionList connections;
 	PBD::ScopedConnectionList _pan_control_connections;
@@ -90,7 +94,7 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	bool ignore_toggle;
 	bool in_pan_update;
 	int _current_nouts;
-	int _current_npans;
+	int _current_nins;
 
 	static const int pan_bar_height;
 
@@ -98,22 +102,17 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	Panner2dWindow* big_window;
 
 	Gtk::VBox           pan_bar_packer;
-	Gtk::Adjustment	    hAdjustment;
-	Gtk::Adjustment     vAdjustment;
-	Gtk::Viewport       panning_viewport;
-	Gtk::EventBox       panning_up;
-	Gtk::Arrow          panning_up_arrow;
-	Gtk::EventBox       panning_down;
-	Gtk::Arrow          panning_down_arrow;
 	Gtk::VBox           pan_vbox;
+        Gtk::VBox           poswidth_box;
 	Width              _width;
 
-	Gtk::ToggleButton   panning_link_button;
-	Gtk::Button         panning_link_direction_button;
-	Gtk::HBox           panning_link_box;
-
-	bool panning_link_button_press (GdkEventButton*);
-	bool panning_link_button_release (GdkEventButton*);
+        StereoPanner*  _stereo_panner;
+        bool _ignore_width_change;
+        bool _ignore_position_change;
+        void width_adjusted ();
+        void show_width ();
+        void position_adjusted ();
+        void show_position ();
 
 	Gtk::Menu* pan_astate_menu;
 	Gtk::Menu* pan_astyle_menu;
@@ -121,21 +120,13 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	Gtk::Button pan_automation_style_button;
 	Gtk::ToggleButton pan_automation_state_button;
 
-	void panning_link_direction_clicked ();
-
-	std::vector<Gtk::Adjustment*> pan_adjustments;
-	std::vector<PannerBar*> pan_bars;
+	std::vector<MonoPanner*> pan_bars;
 
-	void pan_adjustment_changed (uint32_t which);
 	void pan_value_changed (uint32_t which);
-	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);
@@ -144,16 +135,12 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	gint start_pan_touch (GdkEventButton*);
 	gint end_pan_touch (GdkEventButton*);
 
-	bool pan_button_event (GdkEventButton*, uint32_t which);
-
-	void connect_to_pan_control (uint32_t);
+	bool pan_button_event (GdkEventButton*);
 
 	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 (uint32_t);
-	void pan_reset_all ();
+	void build_pan_menu ();
+	void pan_reset ();
 	void pan_bypass_toggle ();
 
 	void pan_automation_state_changed();