summaryrefslogtreecommitdiff
path: root/gtk2_ardour/shuttle_control.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2012-12-30 21:50:08 +0000
committerRobin Gareus <robin@gareus.org>2012-12-30 21:50:08 +0000
commitf2d27bb5139d2b611e73d58aa99c5653fcd53cc5 (patch)
tree6ef8077f3107f54711b4eb778427e255052a0d85 /gtk2_ardour/shuttle_control.cc
parenta167dc9ceca72e13696d2eb5fc4681b10d6db56b (diff)
address #5236 - Varispeed 'spring' retains speed. temp fix
git-svn-id: svn://localhost/ardour2/branches/3.0@13748 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/shuttle_control.cc')
-rw-r--r--gtk2_ardour/shuttle_control.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index aaa22f5089..b4095f7c0c 100644
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -290,6 +290,9 @@ ShuttleControl::on_button_release_event (GdkEventButton* ev)
gdk_pointer_ungrab (GDK_CURRENT_TIME);
if (Config->get_shuttle_behaviour() == Sprung) {
+ if (shuttle_speed_on_grab == 0 ) {
+ _session->request_transport_speed (1.0);
+ }
_session->request_transport_speed (shuttle_speed_on_grab);
} else {
mouse_shuttle (ev->x, true);
@@ -500,7 +503,7 @@ ShuttleControl::use_shuttle_fract (bool force)
speed = shuttle_max_speed * shuttle_fract;
}
- _session->request_transport_speed_nonzero (speed, true);
+ _session->request_transport_speed_nonzero (speed, Config->get_shuttle_behaviour() == Wheel);
}
void