From: Paul Davis Date: Tue, 15 Sep 2015 13:08:38 +0000 (-0400) Subject: logic rearrangement to avoid unnecessary call to Route::monitoring_state() in instrum... X-Git-Tag: 4.3~394 X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=bed85f98d141f52fb9425f612f0c4f43d38a1319 logic rearrangement to avoid unnecessary call to Route::monitoring_state() in instrument/generator tracks --- diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index fb4dafbd0a..29aa5b8a6a 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -501,14 +501,11 @@ Route::process_output_buffers (BufferSet& bufs, on a transition between monitoring states we get a de-clicking gain change in the _main_outs delivery, if config.get_use_monitor_fades() is true. + + We override this in the case where we have an internal generator. */ - bool silence = monitoring_state () == MonitoringSilence; - - //but we override this in the case where we have an internal generator - if (_have_internal_generator) { - silence = false; - } - + bool silence = _have_internal_generator ? false : (monitoring_state () == MonitoringSilence); + _main_outs->no_outs_cuz_we_no_monitor (silence); /* -------------------------------------------------------------------------------------------