more loop/transport fixups; make visible PH track transport frame as an experiment (instead of audible frame)

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5977 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 1 insertions, 12 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 41f4fbcec2..b4b54fa70d 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1470,21 +1470,14 @@ ARDOUR_UI::transport_roll ()
 	}
 
 	bool rolling = session->transport_rolling();
-	bool relocate = true;
 
 	if (session->get_play_loop()) {
 		session->request_play_loop (false, true);
-		relocate = false;
 	} else if (session->get_play_range ()) {
 		session->request_play_range (false, true);
-		relocate = false;
 	} 
 
-	if (rolling) {
-		if (relocate) {
-			session->request_locate (session->last_transport_start(), true);
-		}
-	} else {
+	if (!rolling) {
 		session->request_transport_speed (1.0f);
 	}
 
@@ -1530,10 +1523,6 @@ ARDOUR_UI::toggle_roll (bool with_abort)
 	if (affect_transport) {
 
 		if (rolling) {
-			session->request_locate (session->last_transport_start(), true);
-		}
-		
-		if (rolling) {
 			session->request_stop (with_abort);
 		} else {
 			session->request_transport_speed (1.0f);