From 02e5605cdd2d248c185bcbb995456161dd2c4d21 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 25 Apr 2020 18:24:42 +0200 Subject: [PATCH] NO-OP: reduce scope, return early --- libs/ardour/route.cc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index db41c73eac..d6cfec92e9 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -4313,23 +4313,23 @@ Route::update_signal_latency (bool apply_to_delayline) void Route::apply_latency_compensation () { - if (_delayline) { - samplecnt_t old = _delayline->delay (); + if (!_delayline) { + return; + } - samplecnt_t play_lat_in = _input->connected_latency (true); - samplecnt_t play_lat_out = _output->connected_latency (true); - samplecnt_t latcomp = play_lat_in - play_lat_out - _signal_latency; + samplecnt_t play_lat_in = _input->connected_latency (true); + samplecnt_t play_lat_out = _output->connected_latency (true); + samplecnt_t latcomp = play_lat_in - play_lat_out - _signal_latency; #if 0 // DEBUG - samplecnt_t capt_lat_in = _input->connected_latency (false); - samplecnt_t capt_lat_out = _output->connected_latency (false); - samplecnt_t latcomp_capt = capt_lat_out - capt_lat_in - _signal_latency; + samplecnt_t capt_lat_in = _input->connected_latency (false); + samplecnt_t capt_lat_out = _output->connected_latency (false); + samplecnt_t latcomp_capt = capt_lat_out - capt_lat_in - _signal_latency; - cout << "ROUTE " << name() << " delay for " << latcomp << " (c: " << latcomp_capt << ")" << endl; + cout << "ROUTE " << name() << " delay for " << latcomp << " (c: " << latcomp_capt << ")" << endl; #endif - _delayline->set_delay (latcomp > 0 ? latcomp : 0); - } + _delayline->set_delay (latcomp > 0 ? latcomp : 0); } void