ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix track->track bounce alignment

Browse Source 
When a track's output is not connected, we assume
its output playback latency matches that of the master-bus.

This is to prevent the track's output latency to float
freely (see also a556e96ed0).

This failed if a track is connected to another track which is
not connected.
This commit is contained in:
Robin Gareus 2022-03-11 03:37:14 +01:00
parent d35f33e757
commit e58c312420
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/ardour/route.h
View File

@ -453,6 +453,11 @@ public:
bool feeds_according_to_graph (boost::shared_ptr<Route>);
/** Follow output port connections and check if the output *port*
* of any downstream routes is connected.
*/
bool output_effectively_connected () const;
struct FeedRecord {
boost::weak_ptr<Route> r;
bool sends_only;

31
libs/ardour/route.cc
View File

@ -3671,6 +3671,35 @@ Route::feeds_according_to_graph (boost::shared_ptr<Route> other)
return _session._current_route_graph.feeds (boost::dynamic_pointer_cast<Route> (shared_from_this ()), other);
}
bool
Route::output_effectively_connected () const
{
if (!_output->connected ()) {
return false;
}
if (is_master() || is_monitor ()) {
return _output->connected ();
}
if (_output->physically_connected ()) {
return true;
}
boost::shared_ptr<RouteList> routes = _session.get_routes ();
for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
if ((*i).get() == this) {
continue;
}
if ((*i)->input()->connected_to (_output)) {
if ((*i)->output_effectively_connected ()) {
return true;
}
}
}
return false;
}
/** Called from the (non-realtime) butler thread when the transport is stopped */
void
Route::non_realtime_transport_stop (samplepos_t now, bool flush)
@ -4343,7 +4372,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.
*/
_output_latency = _output->connected () ? _output->latency () : (_session.master_out() ? _session.master_out()->output ()->latency () : 0);
_output_latency = output_effectively_connected () ? _output->latency () : (_session.master_out() ? _session.master_out()->output ()->latency () : 0);
Glib::Threads::RWLock::ReaderLock lm (_processor_lock);