From 34f088576cff12d7bfe1b21a0cebd3e194371a64 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 28 Sep 2015 17:42:02 -0400
Subject: get loop recording working when using seam-ed looping

---
 libs/ardour/butler.cc | 94 +++++++++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 45 deletions(-)

(limited to 'libs/ardour/butler.cc')

diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc
index 95ba2a3ffe..8542f5e0cb 100644
--- a/libs/ardour/butler.cc
+++ b/libs/ardour/butler.cc
@@ -268,44 +268,7 @@ Butler::thread_work ()
 			goto restart;
 		}
 
-		for (i = rl->begin(); !transport_work_requested() && should_run && i != rl->end(); ++i) {
-			// cerr << "write behind for " << (*i)->name () << endl;
-
-			boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
-
-			if (!tr) {
-				continue;
-			}
-
-			/* note that we still try to flush diskstreams attached to inactive routes
-			 */
-
-                        gint64 before, after;
-                        int ret;
-
-			DEBUG_TRACE (DEBUG::Butler, string_compose ("butler flushes track %1 capture load %2\n", tr->name(), tr->capture_buffer_load()));
-                        before = g_get_monotonic_time ();
-                        ret = tr->do_flush (ButlerContext);
-                        after = g_get_monotonic_time ();
-			switch (ret) {
-			case 0:
-				DEBUG_TRACE (DEBUG::Butler, string_compose ("\tflush complete for %1, %2 usecs\n", tr->name(), after - before));
-				break;
-				
-			case 1:
-				DEBUG_TRACE (DEBUG::Butler, string_compose ("\tflush not finished for %1, %2 usecs\n", tr->name(), after - before));
-				disk_work_outstanding = true;
-				break;
-
-			default:
-				err++;
-				error << string_compose(_("Butler write-behind failure on dstream %1"), (*i)->name()) << endmsg;
-                                std::cerr << string_compose(_("Butler write-behind failure on dstream %1"), (*i)->name()) << std::endl;
-				/* don't break - try to flush all streams in case they
-				   are split across disks.
-				*/
-			}
-		}
+		disk_work_outstanding = flush_tracks_to_disk (rl, err, false);
 
 		if (err && _session.actively_recording()) {
 			/* stop the transport and try to catch as much possible
@@ -315,12 +278,6 @@ Butler::thread_work ()
 			_session.request_stop ();
 		}
 
-		if (i != rl->begin() && i != rl->end()) {
-			/* we didn't get to all the streams */
-			DEBUG_TRACE (DEBUG::Butler, "not all tracks processed, will need to go back for more\n");
-			disk_work_outstanding = true;
-		}
-
 		if (!err && transport_work_requested()) {
 			DEBUG_TRACE (DEBUG::Butler, "transport work requested during flush, back to restart\n");
 			goto restart;
@@ -330,7 +287,6 @@ Butler::thread_work ()
 			_session.refresh_disk_space ();
 		}
 
-
 		{
 			Glib::Threads::Mutex::Lock lm (request_lock);
 
@@ -351,6 +307,54 @@ Butler::thread_work ()
 	return (0);
 }
 
+bool
+Butler::flush_tracks_to_disk (boost::shared_ptr<RouteList> rl, uint32_t& errors, bool force)
+{
+	bool disk_work_outstanding = false;
+
+	for (RouteList::iterator i = rl->begin(); (force || !transport_work_requested()) && should_run && i != rl->end(); ++i) {
+
+		// cerr << "write behind for " << (*i)->name () << endl;
+
+		boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+
+		if (!tr) {
+			continue;
+		}
+
+		/* note that we still try to flush diskstreams attached to inactive routes
+		 */
+
+		gint64 before, after;
+		int ret;
+
+		DEBUG_TRACE (DEBUG::Butler, string_compose ("butler flushes track %1 capture load %2\n", tr->name(), tr->capture_buffer_load()));
+		before = g_get_monotonic_time ();
+		ret = tr->do_flush (ButlerContext, force);
+		after = g_get_monotonic_time ();
+		switch (ret) {
+		case 0:
+			DEBUG_TRACE (DEBUG::Butler, string_compose ("\tflush complete for %1, %2 usecs\n", tr->name(), after - before));
+			break;
+
+		case 1:
+			DEBUG_TRACE (DEBUG::Butler, string_compose ("\tflush not finished for %1, %2 usecs\n", tr->name(), after - before));
+			disk_work_outstanding = true;
+			break;
+
+		default:
+			errors++;
+			error << string_compose(_("Butler write-behind failure on dstream %1"), (*i)->name()) << endmsg;
+			std::cerr << string_compose(_("Butler write-behind failure on dstream %1"), (*i)->name()) << std::endl;
+			/* don't break - try to flush all streams in case they
+			   are split across disks.
+			*/
+		}
+	}
+
+	return disk_work_outstanding;
+}	
+
 void
 Butler::schedule_transport_work ()
 {
-- 
cgit v1.2.3