From 9f5a179bf1d2d4e8cffcb33a679492f8f17d5624 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 2 Jul 2010 20:42:37 +0000 Subject: [PATCH] and yet more of a possible fix for NPAE problem git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@7361 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/session_butler.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc index ed73943842..17827beed7 100644 --- a/libs/ardour/session_butler.cc +++ b/libs/ardour/session_butler.cc @@ -245,11 +245,12 @@ Session::butler_thread_work () } } - disk_work_outstanding = false; bytes = 0; compute_io = true; restart: + + disk_work_outstanding = false; cerr << "transport work = " << g_atomic_int_get (&butler_should_do_transport_work) << endl; if (transport_work_requested()) { cerr << "Do transport work\n"; @@ -380,7 +381,7 @@ Session::butler_thread_work () { Glib::Mutex::Lock lm (butler_request_lock); - + if (butler_should_run && (disk_work_outstanding || transport_work_requested())) { // for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) { // cerr << "AFTER " << (*i)->name() << ": pb = " << (*i)->playback_buffer_load() << " cp = " << (*i)->capture_buffer_load() << endl;