summaryrefslogtreecommitdiff
path: root/libs/backends/portaudio
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-09-22 15:28:00 +0200
committerRobin Gareus <robin@gareus.org>2017-09-23 00:34:01 +0200
commitab3889fff84a5e0e48c588e9071921ee6578efa9 (patch)
tree09998ff4f77961a03722f91d33d6cdb224d0e376 /libs/backends/portaudio
parent25f45022db58633dd8e2fec6844157b44fe71428 (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/portaudio')
-rw-r--r--libs/backends/portaudio/portaudio_backend.cc49
-rw-r--r--libs/backends/portaudio/portaudio_backend.h15
2 files changed, 53 insertions, 11 deletions
diff --git a/libs/backends/portaudio/portaudio_backend.cc b/libs/backends/portaudio/portaudio_backend.cc
index be43e67a62..7a65bdcc38 100644
--- a/libs/backends/portaudio/portaudio_backend.cc
+++ b/libs/backends/portaudio/portaudio_backend.cc
@@ -1500,6 +1500,24 @@ PortAudioBackend::unregister_ports (bool system_only)
}
}
+void
+PortAudioBackend::update_system_port_latecies ()
+{
+ for (std::vector<PamPort*>::const_iterator it = _system_inputs.begin (); it != _system_inputs.end (); ++it) {
+ (*it)->update_connected_latency (true);
+ }
+ for (std::vector<PamPort*>::const_iterator it = _system_outputs.begin (); it != _system_outputs.end (); ++it) {
+ (*it)->update_connected_latency (false);
+ }
+
+ for (std::vector<PamPort*>::const_iterator it = _system_midi_in.begin (); it != _system_midi_in.end (); ++it) {
+ (*it)->update_connected_latency (true);
+ }
+ for (std::vector<PamPort*>::const_iterator it = _system_midi_out.begin (); it != _system_midi_out.end (); ++it) {
+ (*it)->update_connected_latency (false);
+ }
+}
+
int
PortAudioBackend::connect (const std::string& src, const std::string& dst)
{
@@ -2132,6 +2150,7 @@ PortAudioBackend::process_port_connection_changes ()
manager.graph_order_callback();
}
if (connections_changed || ports_changed) {
+ update_system_port_latecies ();
engine.latency_callback(false);
engine.latency_callback(true);
}
@@ -2322,6 +2341,36 @@ bool PamPort::is_physically_connected () const
return false;
}
+void
+PamPort::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::vector<PamPort*>::const_iterator it = _connections.begin (); it != _connections.end (); ++it) {
+ if ((*it)->is_physical ()) {
+ (*it)->update_connected_latency (is_input ());
+ }
+ }
+}
+
+void
+PamPort::update_connected_latency (bool for_playback)
+{
+ LatencyRange lr;
+ lr.min = lr.max = 0;
+ for (std::set<PamPort*>::const_iterator it = _connections.begin (); it != _connections.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);
+}
+
/******************************************************************************/
PortAudioPort::PortAudioPort (PortAudioBackend &b, const std::string& name, PortFlags flags)
diff --git a/libs/backends/portaudio/portaudio_backend.h b/libs/backends/portaudio/portaudio_backend.h
index 336621f4ff..bc493101fc 100644
--- a/libs/backends/portaudio/portaudio_backend.h
+++ b/libs/backends/portaudio/portaudio_backend.h
@@ -93,17 +93,9 @@ class PamPort { // PortAudio / PortMidi Backend Port
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:
PortAudioBackend &_osx_backend;
@@ -436,6 +428,7 @@ class PortAudioBackend : public AudioBackend {
int register_system_audio_ports ();
int register_system_midi_ports ();
void unregister_ports (bool system_only = false);
+ void update_system_port_latecies ();
std::vector<PamPort *> _ports;
std::vector<PamPort *> _system_inputs;