summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Emmas <johne53@tiscali.co.uk>2015-06-22 16:08:46 +0100
committerJohn Emmas <johne53@tiscali.co.uk>2015-06-22 16:08:46 +0100
commit32924aa7b8809172eb960245b1982ec7cda590e6 (patch)
treea858948a66e15aa63b63b02d22ae68939cc39afc
parent974e5dcc0ca4dcaebf084097728c6e3fe88781c0 (diff)
When using the Editor's Shuttle control, stop any shuttling by calling Session::request_stop()
Previously we were using a convoluted scheme of firstly setting the transport speed to 1.0, then later re-setting it to 0.0. On Windows this was having some strange side-effects (such as leaving the transport in Play mode and/or resetting the timeline to zero timecode). Hopefully this change will also work for the other platforms.
-rw-r--r--gtk2_ardour/shuttle_control.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index d879ce50ff..440b62aafc 100644
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -302,9 +302,10 @@ ShuttleControl::on_button_release_event (GdkEventButton* ev)
if (Config->get_shuttle_behaviour() == Sprung) {
if (shuttle_speed_on_grab == 0 ) {
- _session->request_transport_speed (1.0);
+ _session->request_stop ();
+ } else {
+ _session->request_transport_speed (shuttle_speed_on_grab);
}
- _session->request_transport_speed (shuttle_speed_on_grab);
} else {
mouse_shuttle (ev->x, true);
}