diff options
author | Robin Gareus <robin@gareus.org> | 2017-09-22 15:28:00 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2017-09-23 00:34:01 +0200 |
commit | ab3889fff84a5e0e48c588e9071921ee6578efa9 (patch) | |
tree | 09998ff4f77961a03722f91d33d6cdb224d0e376 /libs/backends/coreaudio | |
parent | 25f45022db58633dd8e2fec6844157b44fe71428 (diff) |
Propagate Latency to backend/system ports
Set accumulated capture-latency for physical-outputs
and accumulated playback-latency for physical-inputs
after Ardour is done setting all non-physical port latencies.
This will be needed for latency-compensation of the complete graph.
Diffstat (limited to 'libs/backends/coreaudio')
-rw-r--r-- | libs/backends/coreaudio/coreaudio_backend.cc | 51 | ||||
-rw-r--r-- | libs/backends/coreaudio/coreaudio_backend.h | 15 |
2 files changed, 54 insertions, 12 deletions
diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc index 0e0f33a5d9..fc94145ed5 100644 --- a/libs/backends/coreaudio/coreaudio_backend.cc +++ b/libs/backends/coreaudio/coreaudio_backend.cc @@ -1163,6 +1163,24 @@ CoreAudioBackend::register_system_audio_ports() } void +CoreAudioBackend::update_system_port_latecies () +{ + for (std::vector<CoreBackendPort*>::const_iterator it = _system_inputs.begin (); it != _system_inputs.end (); ++it) { + (*it)->update_connected_latency (true); + } + for (std::vector<CoreBackendPort*>::const_iterator it = _system_outputs.begin (); it != _system_outputs.end (); ++it) { + (*it)->update_connected_latency (false); + } + + for (std::vector<CoreBackendPort*>::const_iterator it = _system_midi_in.begin (); it != _system_midi_in.end (); ++it) { + (*it)->update_connected_latency (true); + } + for (std::vector<CoreBackendPort*>::const_iterator it = _system_midi_out.begin (); it != _system_midi_out.end (); ++it) { + (*it)->update_connected_latency (false); + } +} + +void CoreAudioBackend::coremidi_rediscover() { if (!_run) { return; } @@ -1644,6 +1662,7 @@ CoreAudioBackend::pre_process () manager.graph_order_callback(); } if (connections_changed || ports_changed) { + update_system_port_latecies (); engine.latency_callback(false); engine.latency_callback(true); } @@ -2081,7 +2100,6 @@ void CoreBackendPort::_disconnect (CoreBackendPort *port, bool callback) } } - void CoreBackendPort::disconnect_all () { while (!_connections.empty ()) { @@ -2108,6 +2126,37 @@ bool CoreBackendPort::is_physically_connected () const return false; } +void +CoreBackendPort::set_latency_range (const LatencyRange &latency_range, bool for_playback) +{ + if (for_playback) { + _playback_latency_range = latency_range; + } else { + _capture_latency_range = latency_range; + } + + for (std::set<CoreBackendPort*>::const_iterator it = _connections.begin (); it != _connections.end (); ++it) { + if ((*it)->is_physical ()) { + (*it)->update_connected_latency (is_input ()); + } + } +} + +void +CoreBackendPort::update_connected_latency (bool for_playback) +{ + LatencyRange lr; + lr.min = lr.max = 0; + const std::set<CoreBackendPort *>& cp = get_connections (); + for (std::set<CoreBackendPort*>::const_iterator it = cp.begin (); it != cp.end (); ++it) { + LatencyRange l; + l = (*it)->latency_range (for_playback); + lr.min = std::max (lr.min, l.min); + lr.max = std::max (lr.max, l.max); + } + set_latency_range (lr, for_playback); +} + /******************************************************************************/ CoreAudioPort::CoreAudioPort (CoreAudioBackend &b, const std::string& name, PortFlags flags) diff --git a/libs/backends/coreaudio/coreaudio_backend.h b/libs/backends/coreaudio/coreaudio_backend.h index 5d8c88c3db..7e8c55f2eb 100644 --- a/libs/backends/coreaudio/coreaudio_backend.h +++ b/libs/backends/coreaudio/coreaudio_backend.h @@ -96,17 +96,9 @@ class CoreBackendPort { return for_playback ? _playback_latency_range : _capture_latency_range; } - void set_latency_range (const LatencyRange &latency_range, bool for_playback) - { - if (for_playback) - { - _playback_latency_range = latency_range; - } - else - { - _capture_latency_range = latency_range; - } - } + void set_latency_range (const LatencyRange &latency_range, bool for_playback); + + void update_connected_latency (bool for_playback); private: CoreAudioBackend &_osx_backend; @@ -463,6 +455,7 @@ class CoreAudioBackend : public AudioBackend { PortHandle add_port (const std::string& shortname, ARDOUR::DataType, ARDOUR::PortFlags); int register_system_audio_ports (); void unregister_ports (bool system_only = false); + void update_system_port_latecies (); std::vector<CoreBackendPort *> _system_inputs; std::vector<CoreBackendPort *> _system_outputs; |