Forward port no-process-after-export fix from 2.X revs 7357 and 7361.
git-svn-id: svn://localhost/ardour2/branches/3.0@7368 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
e4c6b5f01a
commit
dc44037a51
|
@ -216,14 +216,17 @@ Butler::thread_work ()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bytes = 0;
|
||||||
|
compute_io = true;
|
||||||
|
|
||||||
|
restart:
|
||||||
|
disk_work_outstanding = false;
|
||||||
|
|
||||||
if (transport_work_requested()) {
|
if (transport_work_requested()) {
|
||||||
_session.butler_transport_work ();
|
_session.butler_transport_work ();
|
||||||
}
|
}
|
||||||
|
|
||||||
disk_work_outstanding = false;
|
|
||||||
bytes = 0;
|
|
||||||
compute_io = true;
|
|
||||||
|
|
||||||
begin = get_microseconds();
|
begin = get_microseconds();
|
||||||
|
|
||||||
boost::shared_ptr<RouteList> rl = _session.get_routes();
|
boost::shared_ptr<RouteList> rl = _session.get_routes();
|
||||||
|
@ -273,7 +276,7 @@ Butler::thread_work ()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!err && transport_work_requested()) {
|
if (!err && transport_work_requested()) {
|
||||||
continue;
|
goto restart;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (compute_io) {
|
if (compute_io) {
|
||||||
|
@ -332,7 +335,7 @@ Butler::thread_work ()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!err && transport_work_requested()) {
|
if (!err && transport_work_requested()) {
|
||||||
continue;
|
goto restart;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (compute_io) {
|
if (compute_io) {
|
||||||
|
@ -358,7 +361,7 @@ Butler::thread_work ()
|
||||||
// cerr << "AFTER " << (*i)->name() << ": pb = " << (*i)->playback_buffer_load() << " cp = " << (*i)->capture_buffer_load() << endl;
|
// cerr << "AFTER " << (*i)->name() << ": pb = " << (*i)->playback_buffer_load() << " cp = " << (*i)->capture_buffer_load() << endl;
|
||||||
// }
|
// }
|
||||||
|
|
||||||
continue;
|
goto restart;
|
||||||
}
|
}
|
||||||
|
|
||||||
paused.signal();
|
paused.signal();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user