From 6e79521e8b7709458b8ee093e2d0dc6440ffea2c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 26 Dec 2011 14:05:19 +0000 Subject: Move some bits from MonoPanner and StereoPanner into a common base class. git-svn-id: svn://localhost/ardour2/branches/3.0@11071 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/stereo_panner.h | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'gtk2_ardour/stereo_panner.h') diff --git a/gtk2_ardour/stereo_panner.h b/gtk2_ardour/stereo_panner.h index f2b04f1af7..8d76442724 100644 --- a/gtk2_ardour/stereo_panner.h +++ b/gtk2_ardour/stereo_panner.h @@ -21,11 +21,8 @@ #define __gtk_ardour_stereo_panner_h__ #include "pbd/signals.h" - -#include -#include - #include "gtkmm2ext/binding_proxy.h" +#include "panner_interface.h" namespace PBD { class Controllable; @@ -35,7 +32,7 @@ namespace ARDOUR { class Panner; } -class StereoPanner : public Gtk::DrawingArea +class StereoPanner : public PannerInterface { public: StereoPanner (boost::shared_ptr); @@ -53,12 +50,8 @@ class StereoPanner : public Gtk::DrawingArea bool on_motion_notify_event (GdkEventMotion*); bool on_scroll_event (GdkEventScroll*); bool on_key_press_event (GdkEventKey*); - bool on_key_release_event (GdkEventKey*); - bool on_enter_notify_event (GdkEventCrossing* ev); - bool on_leave_notify_event (GdkEventCrossing* ev); private: - boost::shared_ptr _panner; boost::shared_ptr position_control; boost::shared_ptr width_control; PBD::ScopedConnectionList connections; @@ -71,13 +64,9 @@ class StereoPanner : public Gtk::DrawingArea double accumulated_delta; bool detented; - Gtk::Window* drag_data_window; - Gtk::Label* drag_data_label; - BindingProxy position_binder; BindingProxy width_binder; - void value_change (); void set_drag_data (); struct ColorScheme { @@ -97,7 +86,7 @@ class StereoPanner : public Gtk::DrawingArea static ColorScheme colors[3]; static void set_colors (); static bool have_colors; - void color_handler (); + void color_handler (); }; #endif /* __gtk_ardour_stereo_panner_h__ */ -- cgit v1.2.3