a few small fixes that help pitchbend control of things, notably the shuttle controller. but note that basically, teh shuttle controller is completely and hopelessly broken through excess complexity and incorrect design

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

1 files changed, 10 insertions, 18 deletions

diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index b4095f7c0c..7096cd31bb 100644
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -427,10 +427,10 @@ ShuttleControl::mouse_shuttle (double x, bool force)
 }
 
 void
-ShuttleControl::set_shuttle_fract (double f)
+ShuttleControl::set_shuttle_fract (double f, bool zero_ok)
 {
 	shuttle_fract = f;
-	use_shuttle_fract (false);
+	use_shuttle_fract (false, zero_ok);
 }
 
 int
@@ -472,7 +472,7 @@ ShuttleControl::fract_as_semitones (float fract, bool& reverse)
 }
 
 void
-ShuttleControl::use_shuttle_fract (bool force)
+ShuttleControl::use_shuttle_fract (bool force, bool zero_ok)
 {
 	microseconds_t now = get_microseconds();
 
@@ -503,7 +503,11 @@ ShuttleControl::use_shuttle_fract (bool force)
 		speed = shuttle_max_speed * shuttle_fract;
 	}
 
-	_session->request_transport_speed_nonzero (speed, Config->get_shuttle_behaviour() == Wheel);
+	if (zero_ok) {
+		_session->request_transport_speed (speed, Config->get_shuttle_behaviour() == Wheel);
+	} else {
+		_session->request_transport_speed_nonzero (speed, Config->get_shuttle_behaviour() == Wheel);
+	}
 }
 
 void
@@ -657,25 +661,13 @@ ShuttleControl::ShuttleControllable::ShuttleControllable (ShuttleControl& s)
 void
 ShuttleControl::ShuttleControllable::set_value (double val)
 {
-	double fract;
-
-	if (val == 0.5) {
-		fract = 0.0;
-	} else {
-		if (val < 0.5) {
-			fract = -((0.5 - val)/0.5);
-		} else {
-			fract = ((val - 0.5)/0.5);
-		}
-	}
-
-	sc.set_shuttle_fract (fract);
+	sc.set_shuttle_fract ((val - lower()) / (upper() - lower()), true);
 }
 
 double
 ShuttleControl::ShuttleControllable::get_value () const
 {
-	return sc.get_shuttle_fract ();
+	return lower() + (sc.get_shuttle_fract () * (upper() - lower()));
 }
 
 void