the "final" (??) fixes for transport state stuff before 2.8.4. y'all let me know, i'm sure

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

2 files changed, 13 insertions, 12 deletions

diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index a6b3b6dd4a..f18f0a9e55 100644
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -258,7 +258,7 @@ Session::process_with_events (nframes_t nframes)
 	bool session_needs_butler = false;
 	nframes_t stop_limit;
 	long           frames_moved;
-	
+
 	/* make sure the auditioner is silent */
 
 	if (auditioner) {
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 41b4bcd0a6..c4cfbb802f 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -1198,7 +1198,7 @@ Session::set_play_range (bool yn, bool leave_rolling)
 
 	if (yn) {
 		/* cancel loop play */
-		set_play_loop (false);
+		unset_play_loop ();
 	}
 
 	_play_range = yn;
@@ -1215,6 +1215,16 @@ Session::set_play_range (bool yn, bool leave_rolling)
 }
 
 void
+Session::request_bounded_roll (nframes_t start, nframes_t end)
+{
+	AudioRange ar (start, end, 0);
+	list<AudioRange> lar;
+	lar.push_back (ar);
+	set_audio_range (lar);
+	request_play_range (true, true);
+}
+
+void
 Session::setup_auto_play ()
 {
 	/* Called from event-processing context */
@@ -1270,7 +1280,7 @@ Session::setup_auto_play ()
 	} 
 
 	/* now start rolling at the right place */
-	
+
 	ev = new Event (Event::LocateRoll, Event::Add, Event::Immediate, current_audio_range.front().start, 0.0f, false);
 	merge_event (ev);
 }
@@ -1284,15 +1294,6 @@ Session::request_roll_at_and_return (nframes_t start, nframes_t return_to)
 }
 
 void
-Session::request_bounded_roll (nframes_t start, nframes_t end)
-{
- 	Event *ev = new Event (Event::StopOnce, Event::Replace, end, Event::Immediate, 0.0);
-	queue_event (ev);
-
-	request_locate (start, true);
-}
-
-void
 Session::engine_halted ()
 {
 	bool ignored;