ardour/livetrax
13
0
Fork 0
Code

Cont'd work on track bounce/export alignment

Browse Source 
Due to recent changes, when the master bus is disconnected its
private port latency was never unset. This lead to misalignment
when using stem-export if master (or monitor) output was not
connected.
This commit is contained in:
Robin Gareus 2022-03-13 16:29:42 +01:00
parent d505ae3372
commit 6c0d3651cf
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/ardour/route.cc
View File

@ -4373,7 +4373,7 @@ Route::update_signal_latency (bool apply_to_delayline, bool* delayline_update_ne
* Since the output is not used, Send::_thru_delay is not relevant, and
* Send->effective_latency () should return zero.
*/
if (output_effectively_connected ()) {
if (is_master() || output_effectively_connected ()) {
_output_latency = _output->latency ();
} else if (_session.master_out ()) {
/* We cannot use `_session.master_out()->input()->latency()` because that would return capture latency.
@ -5020,7 +5020,10 @@ Route::update_port_latencies (PortSet& from, PortSet& to, bool playback, samplec
* So for correct alignment we use the Delivery's playback latency.
*/
LatencyRange outport_latency = all_connections;
if (playback && _main_outs && !connected) {
/* routes without latency delayline (master, monitor) always use the
* actual connected latency.
*/
if (playback && _main_outs && !connected && _delayline) {
outport_latency.min = _main_outs->playback_offset () - _main_outs->input_latency ();
outport_latency.max = _main_outs->playback_offset () - _main_outs->input_latency ();
}