X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.h;h=0c0b7cfc66f728b5e2418a61630b8fc26e2f2cea;hb=c59dded55d13486f7b8be0f026cb0e8d17aa5d02;hp=bebffec6c00d532501d1d7b80a2b43e0bb2ddff4;hpb=7b94110c545415af8437fc6631e7663ebb5c28f3;p=ardour.git

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index bebffec6c0..0c0b7cfc66 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,17 +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 Session;
 	class Panner;
+	class PannerShell;
 	class Delivery;
+        class AutomationControl;
 }
+
 namespace Gtkmm2ext {
 	class FastMeter;
 }
@@ -53,63 +58,65 @@ 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_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 ();
 
 	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;
-	ARDOUR::Session& _session;
-	std::vector<sigc::connection> connections;
+	PBD::ScopedConnectionList connections;
+	PBD::ScopedConnectionList _pan_control_connections;
 
 	bool ignore_toggle;
 	bool in_pan_update;
 	int _current_nouts;
-	int _current_npans;
+	int _current_nins;
+	std::string _current_uri;
+	bool _send_mode;
 
-	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;
@@ -117,21 +124,10 @@ class PannerUI : public Gtk::HBox
 	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;
-
-	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);
@@ -140,15 +136,15 @@ 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 pan_reset (uint32_t);
-	void pan_reset_all ();
+	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();
@@ -163,6 +159,12 @@ 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>);
+
+	std::map<std::string,std::string> _panner_list;
+	bool _suspend_menu_callbacks;
 };
 
 #endif /* __ardour_gtk_panner_ui_h__ */