X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.h;h=de93d49956f0aee7785e591f6ddab43c51e5f453;hb=a366fba7d0933a8f2d97d95fefcbcdc9692d2117;hp=093800387dfb1a447253ea268a16d1f1d621969d;hpb=cb413146428ce5db5e281d70f2b3b7df27c1aaab;p=ardour.git

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index 093800387d..de93d49956 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>
@@ -33,15 +32,23 @@
 #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;
+class MonoPanner;
 
 namespace ARDOUR {
-	class IO;
 	class Session;
+	class Panner;
+	class PannerShell;
+	class Delivery;
+        class AutomationControl;
 }
+
 namespace Gtkmm2ext {
 	class FastMeter;
 }
@@ -51,13 +58,15 @@ namespace Gtk {
 	class Menuitem;
 }
 
-class PannerUI : public Gtk::HBox
+class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
   public:
-	PannerUI (boost::shared_ptr<ARDOUR::IO>, ARDOUR::Session&);
+	PannerUI (ARDOUR::Session*);
 	~PannerUI ();
 
-	void pan_changed (void *);
+	virtual void set_panner (boost::shared_ptr<ARDOUR::PannerShell>, boost::shared_ptr<ARDOUR::Panner>);
+
+	void panshell_changed ();
 
 	void update_pan_sensitive ();
 	void update_gain_sensitive ();
@@ -67,60 +76,55 @@ class PannerUI : public Gtk::HBox
 
 	void effective_pan_display ();
 
-	void set_meter_strip_name (string name);
-	PBD::Controllable* get_controllable();
+	void set_meter_strip_name (std::string name);
+
+	void on_size_allocate (Gtk::Allocation &);
+
+	static void setup_slider_pix ();
 
   private:
 	friend class MixerStrip;
 
-	boost::shared_ptr<ARDOUR::IO> _io;
-	ARDOUR::Session& _session;
+	boost::shared_ptr<ARDOUR::PannerShell> _panshell;
+	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_nins;
 
 	static const int pan_bar_height;
 
-	Panner2d*   panner;
+	Panner2d*       twod_panner; ///< 2D panner, or 0
+	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;
+        StereoPanner*  _stereo_panner;
+	MonoPanner*    _mono_panner;
 
-	bool panning_link_button_press (GdkEventButton*);
-	bool panning_link_button_release (GdkEventButton*);
+        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;
+	Gtk::Menu* pan_astate_menu;
+	Gtk::Menu* pan_astyle_menu;
 
 	Gtk::Button pan_automation_style_button;
 	Gtk::ToggleButton pan_automation_state_button;
 
-	void panning_link_direction_clicked ();
-
-	vector<Gtk::Adjustment*> pan_adjustments;
-	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);
@@ -129,14 +133,14 @@ class PannerUI : public Gtk::HBox
 	gint start_pan_touch (GdkEventButton*);
 	gint end_pan_touch (GdkEventButton*);
 
-	bool pan_button_event (GdkEventButton*, uint32_t which);
+	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 build_pan_menu ();
 	void pan_reset ();
 	void pan_bypass_toggle ();
+	void pan_edit ();
 
 	void pan_automation_state_changed();
 	void pan_automation_style_changed();
@@ -151,6 +155,9 @@ 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>);
 };
 
 #endif /* __ardour_gtk_panner_ui_h__ */