From 01476e352e9e55fc03cdbffc72e2b40ba612a060 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 17 Jun 2021 11:22:07 -0400 Subject: [PATCH] Prefer SessionController::ffwd() and rewind() in surfaces I find button_varispeed() confusing, it might be a good idea to split it up entirely. --- libs/surfaces/faderport8/actions.cc | 6 +++++- libs/surfaces/mackie/jog_wheel.cc | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libs/surfaces/faderport8/actions.cc b/libs/surfaces/faderport8/actions.cc index 641f9e18d9..5f401ac3bc 100644 --- a/libs/surfaces/faderport8/actions.cc +++ b/libs/surfaces/faderport8/actions.cc @@ -313,7 +313,11 @@ FaderPort8::button_varispeed (bool ffw) return; } - _controller.button_varispeed (ffw); + if (ffw) { + _controller.ffwd (); + } else { + _controller.rewind (); + } } #ifdef FP8_MUTESOLO_UNDO diff --git a/libs/surfaces/mackie/jog_wheel.cc b/libs/surfaces/mackie/jog_wheel.cc index 93bb5c2e1e..389d50ee85 100644 --- a/libs/surfaces/mackie/jog_wheel.cc +++ b/libs/surfaces/mackie/jog_wheel.cc @@ -73,9 +73,9 @@ void JogWheel::jog_event (float delta) break; default: if (delta > 0) { - _mcp.controller ().button_varispeed (true); + _mcp.controller ().ffwd (); } else if (delta < 0) { - _mcp.controller ().button_varispeed (false); + _mcp.controller ().rewind (); } break; }