diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc index 2c514f188e..2ed82cd8c3 100644 --- a/libs/surfaces/control_protocol/basic_ui.cc +++ b/libs/surfaces/control_protocol/basic_ui.cc @@ -107,7 +107,6 @@ BasicUI::add_marker (const std::string& markername) void BasicUI::rewind () { - std::cerr << "request transport speed of " << session->transport_speed() - 1.5 << std::endl; session->request_transport_speed (session->transport_speed() - 1.5); } diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc index 6ded9a9d20..f87e0fa4fd 100644 --- a/libs/surfaces/mackie/mcp_buttons.cc +++ b/libs/surfaces/mackie/mcp_buttons.cc @@ -503,7 +503,7 @@ MackieControlProtocol::play_press (Button &) again, jump back to where we started last time */ - transport_play (session->transport_rolling() == 1.0); + transport_play (session->transport_speed() == 1.0); return none; } diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index 704671c84c..4b0e918785 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -462,20 +462,12 @@ Strip::vselect_event (Button& button, ButtonState bs) if (ms & MackieControlProtocol::MODIFIER_SHIFT) { - /* get the corresponding vpot and whatever its - * controlling - */ - - Pot* pot = _surface->pots[Pot::ID + _index]; - - if (pot) { - boost::shared_ptr ac = pot->control (); + boost::shared_ptr ac = _vpot->control (); - if (ac) { - - /* reset to default/normal value */ - ac->set_value (ac->normal()); - } + if (ac) { + + /* reset to default/normal value */ + ac->set_value (ac->normal()); } } else {