X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.h;h=d587359ecdf62ba74e80d70df88ed217290c9472;hb=a5abcd306ba589411aa8b4e5b2729621bdc77d3a;hp=78fc86885d143acc2c44e2878a482e0249d86d87;hpb=c33d0ad760e311c37cfcb99e48948cc92472ad55;p=ardour.git

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index 78fc86885d..d587359ecd 100644
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -15,7 +15,6 @@
     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__
@@ -31,12 +30,13 @@
 #include <gtkmm/togglebutton.h>
 #include <gtkmm/button.h>
 
-#include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/click_box.h>
+#include <gtkmm2ext/slider_controller.h>
 
 #include "enums.h"
 
 class Panner2d;
+class PannerBar;
 
 namespace ARDOUR {
 	class IO;
@@ -44,7 +44,6 @@ namespace ARDOUR {
 }
 namespace Gtkmm2ext {
 	class FastMeter;
-	class BarController;
 }
 
 namespace Gtk {
@@ -55,7 +54,7 @@ namespace Gtk {
 class PannerUI : public Gtk::HBox
 {
   public:
-	PannerUI (ARDOUR::IO&, ARDOUR::Session&);
+	PannerUI (boost::shared_ptr<ARDOUR::IO>, ARDOUR::Session&);
 	~PannerUI ();
 
 	void pan_changed (void *);
@@ -72,12 +71,14 @@ class PannerUI : public Gtk::HBox
 
   private:
 	friend class MixerStrip;
-	ARDOUR::IO& _io;
+	boost::shared_ptr<ARDOUR::IO> _io;
 	ARDOUR::Session& _session;
 
 	bool ignore_toggle;
 	bool in_pan_update;
 
+	static const int pan_bar_height;
+
 	Panner2d*   panner;
 
 	Gtk::VBox           pan_bar_packer;
@@ -90,26 +91,24 @@ class PannerUI : public Gtk::HBox
 	Gtk::Arrow          panning_down_arrow;
 	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;
 
+	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;
 
-
-	gint panning_link_button_press (GdkEventButton*);
-	gint panning_link_button_release (GdkEventButton*);
 	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);
@@ -128,7 +127,8 @@ class PannerUI : public Gtk::HBox
 	gint start_pan_touch (GdkEventButton*);
 	gint end_pan_touch (GdkEventButton*);
 
-	gint pan_button_event (GdkEventButton*, uint32_t which);
+	bool pan_button_event (GdkEventButton*, uint32_t which);
+
 	Gtk::Menu* pan_menu;
 	Gtk::CheckMenuItem* bypass_menu_item;
 	void build_pan_menu (uint32_t which);