summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-09-15 09:08:38 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2015-09-15 09:08:38 -0400
commitbed85f98d141f52fb9425f612f0c4f43d38a1319 (patch)
tree3070965bf575569fe99a85a5e0eccdf3ac52d35e
parent392836a7d281a3641cee14a2a06c207b0ef675cd (diff)
logic rearrangement to avoid unnecessary call to Route::monitoring_state() in instrument/generator tracks
-rw-r--r--libs/ardour/route.cc11
1 files changed, 4 insertions, 7 deletions
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);
/* -------------------------------------------------------------------------------------------