smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 00:04:56 +01:00
Code Issues Projects Releases Wiki Activity

MCP: more sensible version of previous commit, and better behaviour for play button after ffwd or rewind

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12101 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-04-26 21:57:47 +00:00
parent ab8ebe97bb
commit cafbc632fb
3 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/surfaces/control_protocol/basic_ui.cc
View file

@ -107,7 +107,6 @@ BasicUI::add_marker (const std::string& markername)
void void
BasicUI::rewind () BasicUI::rewind ()
{ {
std::cerr << "request transport speed of " << session->transport_speed() - 1.5 << std::endl;
session->request_transport_speed (session->transport_speed() - 1.5); session->request_transport_speed (session->transport_speed() - 1.5);
} }

2
libs/surfaces/mackie/mcp_buttons.cc
View file

@ -503,7 +503,7 @@ MackieControlProtocol::play_press (Button &)
again, jump back to where we started last time 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; return none;
} }

18
libs/surfaces/mackie/strip.cc
View file

@ -462,20 +462,12 @@ Strip::vselect_event (Button& button, ButtonState bs)
if (ms & MackieControlProtocol::MODIFIER_SHIFT) { if (ms & MackieControlProtocol::MODIFIER_SHIFT) {
/* get the corresponding vpot and whatever its boost::shared_ptr<AutomationControl> ac = _vpot->control ();
* controlling
*/
Pot* pot = _surface->pots[Pot::ID + _index];
if (pot) {
boost::shared_ptr<AutomationControl> ac = pot->control ();
if (ac) { if (ac) {
/* reset to default/normal value */ /* reset to default/normal value */
ac->set_value (ac->normal()); ac->set_value (ac->normal());
}
} }
} else { } else {