X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Fgtkmm2ext%2Fslider_controller.h;h=9919093eaebfe0e68ab8e5517c34d832d59d69ae;hb=7abd6d2366c5204470ff261eba5bb0214455be02;hp=f0f645eab7502b402c77344074aa378fb46efd17;hpb=79986643c0c904f6574bb5323e2233a43a9e622e;p=ardour.git

diff --git a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h
index f0f645eab7..9919093eae 100644
--- a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h
+++ b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h
@@ -14,7 +14,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __gtkmm2ext_slider_controller_h__
@@ -22,7 +21,7 @@
 
 #include <gtkmm.h>
 #include <gtkmm2ext/popup.h>
-#include <gtkmm2ext/pixscroller.h>
+#include <gtkmm2ext/pixfader.h>
 #include <gtkmm2ext/binding_proxy.h>
 
 namespace Gtkmm2ext {
@@ -35,13 +34,12 @@ namespace PBD {
 
 namespace Gtkmm2ext {
 
-class SliderController : public Gtkmm2ext::PixScroller
+class SliderController : public Gtkmm2ext::PixFader
 {
   public:
-	SliderController (Glib::RefPtr<Gdk::Pixbuf> slider,
-			  Glib::RefPtr<Gdk::Pixbuf> rail,
-			  Gtk::Adjustment* adj,
-			  PBD::Controllable&,
+	SliderController (Glib::RefPtr<Gdk::Pixbuf> image,
+			  Gtk::Adjustment* adj, int orientation,
+			  PBD::Controllable*,
 			  bool with_numeric = true);
 
         virtual ~SliderController () {}
@@ -52,6 +50,8 @@ class SliderController : public Gtkmm2ext::PixScroller
 	
 	bool on_button_press_event (GdkEventButton *ev);
 
+	void set_controllable (PBD::Controllable* c) { binding_proxy.set_controllable (c); }
+
   protected:
 	BindingProxy binding_proxy;
 	Glib::RefPtr<Gdk::Pixbuf> slider;
@@ -64,20 +64,18 @@ class SliderController : public Gtkmm2ext::PixScroller
 class VSliderController : public SliderController
 {
   public:
-	VSliderController (Glib::RefPtr<Gdk::Pixbuf> slider,
-			   Glib::RefPtr<Gdk::Pixbuf> rail,
+	VSliderController (Glib::RefPtr<Gdk::Pixbuf> image,
 			   Gtk::Adjustment *adj,
-			   PBD::Controllable&,
+			   PBD::Controllable*,
 			   bool with_numeric = true);
 };
 
 class HSliderController : public SliderController
 {
   public:
-	HSliderController (Glib::RefPtr<Gdk::Pixbuf> slider,
-			   Glib::RefPtr<Gdk::Pixbuf> rail,
+	HSliderController (Glib::RefPtr<Gdk::Pixbuf> image,
 			   Gtk::Adjustment *adj,
-			   PBD::Controllable&,
+			   PBD::Controllable*,
 			   bool with_numeric = true);
 };