Slider Controller API Change

Prepare to allow BarController (with Spinbutton) to translate
internal/interface values for the SpinBox.

(The change is irrelevant for the fader/slider itself which
always use the [user-]interface value)

3 files changed, 10 insertions, 9 deletions

diff --git a/libs/gtkmm2ext/barcontroller.cc b/libs/gtkmm2ext/barcontroller.cc
index 5ac5821205..bb20cae922 100644
--- a/libs/gtkmm2ext/barcontroller.cc
+++ b/libs/gtkmm2ext/barcontroller.cc
@@ -39,7 +39,7 @@ using namespace Gtkmm2ext;
 
 BarController::BarController (Gtk::Adjustment& adj,
 		boost::shared_ptr<PBD::Controllable> mc)
-	: _slider (&adj, 60, 16)
+	: _slider (&adj, mc, 60, 16)
 	, _switching (false)
 	, _switch_on_release (false)
 {
diff --git a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h
index 2b4205c2ca..f67960babd 100644
--- a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h
+++ b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h
@@ -45,7 +45,7 @@ namespace Gtkmm2ext {
 class LIBGTKMM2EXT_API SliderController : public Gtkmm2ext::PixFader
 {
 	public:
-	SliderController (Gtk::Adjustment* adj, int orientation, int, int);
+	SliderController (Gtk::Adjustment* adj, boost::shared_ptr<PBD::Controllable> mc, int orientation, int, int);
 
 	virtual ~SliderController () {}
 
@@ -61,13 +61,13 @@ class LIBGTKMM2EXT_API SliderController : public Gtkmm2ext::PixFader
 class LIBGTKMM2EXT_API VSliderController : public SliderController
 {
 	public:
-	VSliderController (Gtk::Adjustment *adj, int, int);
+	VSliderController (Gtk::Adjustment *adj, boost::shared_ptr<PBD::Controllable> mc, int, int);
 };
 
 class LIBGTKMM2EXT_API HSliderController : public SliderController
 {
 	public:
-	HSliderController (Gtk::Adjustment *adj, int, int);
+	HSliderController (Gtk::Adjustment *adj, boost::shared_ptr<PBD::Controllable> mc, int, int);
 };
 
 
diff --git a/libs/gtkmm2ext/slider_controller.cc b/libs/gtkmm2ext/slider_controller.cc
index 4fd78d095f..ab629f411a 100644
--- a/libs/gtkmm2ext/slider_controller.cc
+++ b/libs/gtkmm2ext/slider_controller.cc
@@ -22,13 +22,14 @@
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/pixfader.h>
 #include <gtkmm2ext/slider_controller.h>
+#include "pbd/controllable.h"
 
 #include "i18n.h"
 
 using namespace Gtkmm2ext;
 using namespace PBD;
 
-SliderController::SliderController (Gtk::Adjustment *adj, int orientation, int fader_length, int fader_girth)
+SliderController::SliderController (Gtk::Adjustment *adj, boost::shared_ptr<PBD::Controllable> mc, int orientation, int fader_length, int fader_girth)
 	: PixFader (*adj, orientation, fader_length, fader_girth)
 	, spin (*adj, 0, 2)
 {			  
@@ -47,12 +48,12 @@ SliderController::on_button_press_event (GdkEventButton *ev)
 	return PixFader::on_button_press_event (ev);
 }
 
-VSliderController::VSliderController (Gtk::Adjustment *adj, int fader_length, int fader_girth)
-	: SliderController (adj, VERT, fader_length, fader_girth)
+VSliderController::VSliderController (Gtk::Adjustment *adj, boost::shared_ptr<PBD::Controllable> mc, int fader_length, int fader_girth)
+	: SliderController (adj, mc, VERT, fader_length, fader_girth)
 {
 }
 
-HSliderController::HSliderController (Gtk::Adjustment *adj, int fader_length, int fader_girth)
-	: SliderController (adj, HORIZ, fader_length, fader_girth)
+HSliderController::HSliderController (Gtk::Adjustment *adj, boost::shared_ptr<PBD::Controllable> mc, int fader_length, int fader_girth)
+	: SliderController (adj, mc, HORIZ, fader_length, fader_girth)
 {
 }