summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2014-06-13 13:33:04 +0200
committerRobin Gareus <robin@gareus.org>2014-06-13 13:51:42 +0200
commitff39a42581595444146458f7ccb14ddc0bcebff0 (patch)
tree429ecd364af1ce4add2e1cd9bf02e7f36695b7c6 /libs
parentb68552d9a0786b8ebe89c011cc880f061cd4ba87 (diff)
ALSA backend: set latencies to zero when measuring latency
Diffstat (limited to 'libs')
-rw-r--r--libs/backends/alsa/alsa_audiobackend.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc
index 342a478296..4fd83d6714 100644
--- a/libs/backends/alsa/alsa_audiobackend.cc
+++ b/libs/backends/alsa/alsa_audiobackend.cc
@@ -923,7 +923,7 @@ AlsaAudioBackend::register_system_audio_ports()
const int a_out = _n_outputs > 0 ? _n_outputs : 2;
/* audio ports */
- lr.min = lr.max = _samples_per_period + _measure_latency ? 0 : _systemic_audio_input_latency;
+ lr.min = lr.max = _samples_per_period + (_measure_latency ? 0 : _systemic_audio_input_latency);
for (int i = 1; i <= a_ins; ++i) {
char tmp[64];
snprintf(tmp, sizeof(tmp), "system:capture_%d", i);
@@ -933,7 +933,7 @@ AlsaAudioBackend::register_system_audio_ports()
_system_inputs.push_back(static_cast<AlsaPort*>(p));
}
- lr.min = lr.max = _samples_per_period + _measure_latency ? 0 : _systemic_audio_output_latency;
+ lr.min = lr.max = _samples_per_period + (_measure_latency ? 0 : _systemic_audio_output_latency);
for (int i = 1; i <= a_out; ++i) {
char tmp[64];
snprintf(tmp, sizeof(tmp), "system:playback_%d", i);
@@ -985,7 +985,7 @@ AlsaAudioBackend::register_system_midi_ports()
delete mout;
}
LatencyRange lr;
- lr.min = lr.max = _samples_per_period + nfo->systemic_output_latency;
+ lr.min = lr.max = _samples_per_period + (_measure_latency ? 0 : nfo->systemic_output_latency);
set_latency_range (p, false, lr);
_system_midi_out.push_back(static_cast<AlsaPort*>(p));
_rmidi_out.push_back (mout);
@@ -1016,7 +1016,7 @@ AlsaAudioBackend::register_system_midi_ports()
continue;
}
LatencyRange lr;
- lr.min = lr.max = _samples_per_period + nfo->systemic_input_latency;
+ lr.min = lr.max = _samples_per_period + (_measure_latency ? 0 : nfo->systemic_input_latency);
set_latency_range (p, false, lr);
_system_midi_in.push_back(static_cast<AlsaPort*>(p));
_rmidi_in.push_back (midin);