X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.h;h=6be92f9c5a13356a4310e8abcffb58421273c166;hb=3705a2d6307cf443acbf8419b0e0f560591f2016;hp=0f062db7903929e1c7c0e6e2eb715c77905cf7db;hpb=e493b2b7c4fbbbfc457f02babf9546289b430177;p=ardour.git

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index 0f062db790..6be92f9c5a 100644
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -15,20 +15,29 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_gtk_panner_ui_h__
 #define __ardour_gtk_panner_ui_h__
 
 #include <vector>
-#include <gtkmm.h>
-#include <gtkmm2ext/slider_controller.h>
+
+#include <gtkmm/box.h>
+#include <gtkmm/adjustment.h>
+#include <gtkmm/viewport.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/arrow.h>
+#include <gtkmm/togglebutton.h>
+#include <gtkmm/button.h>
+
 #include <gtkmm2ext/click_box.h>
+#include <gtkmm2ext/slider_controller.h>
 
 #include "enums.h"
 
 class Panner2d;
+class PannerBar;
+class Panner2dWindow;
 
 namespace ARDOUR {
 	class IO;
@@ -36,15 +45,21 @@ namespace ARDOUR {
 }
 namespace Gtkmm2ext {
 	class FastMeter;
-	class BarController;
+}
+
+namespace Gtk {
+	class Menu;
+	class Menuitem;
 }
 
 class PannerUI : public Gtk::HBox
 {
   public:
-	PannerUI (ARDOUR::IO&, ARDOUR::Session&);
+	PannerUI (ARDOUR::Session&);
 	~PannerUI ();
 
+	virtual void set_io (boost::shared_ptr<ARDOUR::IO>);
+
 	void pan_changed (void *);
 
 	void update_pan_sensitive ();
@@ -56,17 +71,26 @@ class PannerUI : public Gtk::HBox
 	void effective_pan_display ();
 
 	void set_meter_strip_name (string name);
+	boost::shared_ptr<PBD::Controllable> get_controllable();
 
   private:
-	ARDOUR::IO& _io;
+	friend class MixerStrip;
+
+	boost::shared_ptr<ARDOUR::IO> _io;
 	ARDOUR::Session& _session;
+	std::vector<sigc::connection> connections;
 
 	bool ignore_toggle;
 	bool in_pan_update;
 
-	Panner2d*   panner;
+	static const int pan_bar_height;
+
+	Panner2d*       panner;
+	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;
@@ -75,19 +99,23 @@ class PannerUI : public Gtk::HBox
 	Gtk::VBox           pan_vbox;
 	Width              _width;
 
-	gint panning_scroll_button_press_event (GdkEventButton*, int32_t dir);
-	gint panning_scroll_button_release_event (GdkEventButton*, int32_t dir);
-	
 	Gtk::ToggleButton   panning_link_button;
 	Gtk::Button         panning_link_direction_button;
 	Gtk::HBox           panning_link_box;
 
-	gint panning_link_button_press (GdkEventButton*);
-	gint panning_link_button_release (GdkEventButton*);
+	bool panning_link_button_press (GdkEventButton*);
+	bool panning_link_button_release (GdkEventButton*);
+
+	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<Gtkmm2ext::BarController*> pan_bars;
+	vector<PannerBar*> pan_bars;
 
 	void pan_adjustment_changed (uint32_t which);
 	void pan_value_changed (uint32_t which);
@@ -95,6 +123,8 @@ class PannerUI : public Gtk::HBox
 	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 ();
 	
@@ -106,15 +136,28 @@ class PannerUI : public Gtk::HBox
 	gint start_pan_touch (GdkEventButton*);
 	gint end_pan_touch (GdkEventButton*);
 
-	gint entry_focus_event (GdkEventFocus* ev);
+	bool pan_button_event (GdkEventButton*, uint32_t which);
 
-	gint pan_button_event (GdkEventButton*, uint32_t which);
 	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 ();
 	void pan_bypass_toggle ();
+
+	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;
+
+	std::string astate_string (ARDOUR::AutoState);
+	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);
 };
 
 #endif /* __ardour_gtk_panner_ui_h__ */