From cafbc632fb71db817d399dce5f18be7528573a6f Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 26 Apr 2012 21:57:47 +0000
Subject: [PATCH] MCP: more sensible version of previous commit, and better
 behaviour for play button after ffwd or rewind

git-svn-id: svn://localhost/ardour2/branches/3.0@12101 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/surfaces/control_protocol/basic_ui.cc |  1 -
 libs/surfaces/mackie/mcp_buttons.cc        |  2 +-
 libs/surfaces/mackie/strip.cc              | 18 +++++-------------
 3 files changed, 6 insertions(+), 15 deletions(-)

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<AutomationControl> ac = pot->control ();
+			boost::shared_ptr<AutomationControl> 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 {