diff options
Diffstat (limited to 'libs/ardour/session_process.cc')
| -rw-r--r-- | libs/ardour/session_process.cc | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 99615a08b3..31cf3a930d 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -47,12 +47,17 @@ Session::process (nframes_t nframes) { _silent = false; + if (processing_blocked()) { + _silent = true; + return; + } + if (non_realtime_work_pending()) { if (!transport_work_requested ()) { post_transport (); } } - + (this->*process_function) (nframes); { @@ -82,13 +87,6 @@ Session::no_roll (nframes_t nframes, nframes_t offset) _click_io->silence (nframes, offset); } - if (g_atomic_int_get (&processing_prohibited)) { - for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - (*i)->silence (nframes, offset); - } - return 0; - } - for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { if ((*i)->hidden()) { @@ -866,9 +864,7 @@ Session::maybe_sync_start (nframes_t& nframes, nframes_t& offset) with any fancy stuff here, just the minimal silence. */ - g_atomic_int_inc (&processing_prohibited); - no_roll (nframes, 0); - g_atomic_int_dec_and_test (&processing_prohibited); + _silent = true; if (Config->get_locate_while_waiting_for_sync()) { if (micro_locate (nframes)) { |