X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.h;h=e6372f3486184625a4d0780082c335b91bf03175;hb=7c94499aeca8a67ee5f0fe51fb4f957d6618fef4;hp=0bb84019570aaaa0496a26cef9b2b3e54ce8c77d;hpb=a49b0f53aa2d83a9291c35f323f90b46d8869390;p=ardour.git

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index 0bb8401957..e6372f3486 100644
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -73,11 +73,12 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 	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 on_size_allocate (Gtk::Allocation &);
 
@@ -85,6 +86,7 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
   private:
 	friend class MixerStrip;
+	friend class SendUI;
 
 	boost::shared_ptr<ARDOUR::PannerShell> _panshell;
 	boost::shared_ptr<ARDOUR::Panner> _panner;
@@ -95,8 +97,8 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	bool in_pan_update;
 	int _current_nouts;
 	int _current_nins;
-
-	static const int pan_bar_height;
+	std::string _current_uri;
+	bool _send_mode;
 
 	Panner2d*       twod_panner; ///< 2D panner, or 0
 	Panner2dWindow* big_window;
@@ -119,11 +121,8 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	Gtk::Menu* pan_astate_menu;
 	Gtk::Menu* pan_astyle_menu;
 
-	Gtk::Button pan_automation_style_button;
 	Gtk::ToggleButton pan_automation_state_button;
 
-	std::vector<MonoPanner*> pan_bars;
-
 	void pan_value_changed (uint32_t which);
 	void build_astate_menu ();
 	void build_astyle_menu ();
@@ -143,10 +142,10 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	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();
-	gint pan_automation_style_button_event (GdkEventButton *);
 	gint pan_automation_state_button_event (GdkEventButton *);
 	sigc::connection pan_watching;
 
@@ -154,12 +153,11 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	std::string short_astate_string (ARDOUR::AutoState);
 	std::string _astate_string (ARDOUR::AutoState, bool);
 
-	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__ */