summaryrefslogtreecommitdiff
path: root/gtk2_ardour/shuttle_control.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-10-29 18:32:27 +0100
committerRobin Gareus <robin@gareus.org>2017-10-29 20:04:06 +0100
commitbc18c54c737fee6c19ea69b45faaae6f75e3ec24 (patch)
tree831acca924268d45f20b40f8dd145a6b8eac86cf /gtk2_ardour/shuttle_control.cc
parent6e118448890222518cd150283b31799cd3a7a798 (diff)
Quick hack to test engine vari-speed (2/2)
Diffstat (limited to 'gtk2_ardour/shuttle_control.cc')
-rw-r--r--gtk2_ardour/shuttle_control.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index ce3ce3c593..c18bacc20f 100644
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -154,7 +154,7 @@ ShuttleControl::on_size_allocate (Gtk::Allocation& alloc)
void
ShuttleControl::map_transport_state ()
{
- float speed = _session->transport_speed ();
+ float speed = _session->actual_speed ();
if ( (fabsf( speed - last_speed_displayed) < 0.005f) // dead-zone
&& !( speed == 1.f && last_speed_displayed != 1.f)
@@ -299,7 +299,7 @@ ShuttleControl::on_button_press_event (GdkEventButton* ev)
} else {
add_modal_grab ();
shuttle_grabbed = true;
- shuttle_speed_on_grab = _session->transport_speed ();
+ shuttle_speed_on_grab = _session->actual_speed ();
requested_speed = shuttle_speed_on_grab;
mouse_shuttle (ev->x, true);
gdk_pointer_grab(ev->window,false,
@@ -590,7 +590,7 @@ ShuttleControl::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangl
char buf[32];
if (_session) {
- speed = _session->transport_speed ();
+ speed = _session->actual_speed ();
acutal_speed = speed;
if (shuttle_grabbed) {
speed = requested_speed;
@@ -699,7 +699,7 @@ ShuttleControl::parameter_changed (std::string p)
*/
if (_session) {
if (_session->transport_rolling()) {
- if (_session->transport_speed() == 1.0) {
+ if (_session->actual_speed() == 1.0) {
queue_draw ();
} else {
/* reset current speed and