allow derived children of BarController to set label position as a width fraction, not an absolute position

git-svn-id: svn://localhost/ardour2/branches/3.0@8597 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 5 insertions, 4 deletions

diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index 540612c8d4..5c00d5a779 100644
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -85,8 +85,9 @@ AutomationController::create(
 }
 
 std::string
-AutomationController::get_label (int&)
+AutomationController::get_label (double& xpos)
 {
+        xpos = 0.5;
         return _owner->value_as_string (_controllable);
 }
 
diff --git a/gtk2_ardour/automation_controller.h b/gtk2_ardour/automation_controller.h
index 814f716f13..67def61c35 100644
--- a/gtk2_ardour/automation_controller.h
+++ b/gtk2_ardour/automation_controller.h
@@ -55,7 +55,7 @@ public:
 
 private:
 	AutomationController (boost::shared_ptr<ARDOUR::Automatable> parent, boost::shared_ptr<ARDOUR::AutomationControl> ac, Gtk::Adjustment* adj);
-	std::string get_label (int&);
+	std::string get_label (double&);
 
 	void start_touch();
 	void end_touch();
diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc
index 73b6bf1a30..d7c0be840f 100644
--- a/gtk2_ardour/latency_gui.cc
+++ b/gtk2_ardour/latency_gui.cc
@@ -25,7 +25,7 @@ static const gchar *_unit_strings[] = {
 std::vector<std::string> LatencyGUI::unit_strings;
 
 std::string
-LatencyBarController::get_label (int&)
+LatencyBarController::get_label (double&)
 {
 	double const nframes = _latency_gui->adjustment.get_value();
 	std::stringstream s;
diff --git a/gtk2_ardour/latency_gui.h b/gtk2_ardour/latency_gui.h
index 96aa6090d7..2adf2d4308 100644
--- a/gtk2_ardour/latency_gui.h
+++ b/gtk2_ardour/latency_gui.h
@@ -32,7 +32,7 @@ public:
 private:
 	LatencyGUI* _latency_gui;
 
-	std::string get_label (int&);
+	std::string get_label (double&);
 };
 
 class LatencyGUI : public Gtk::VBox