smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-03 20:29:35 +01:00
Code Issues Projects Releases Wiki Activity

Prepare to allow using ALSA backend with nperiods > 3

Browse source 
This will still need an update for Alsa_pcmi::set_hwpar() capture
channel (which is fixed at 2, unless FRAG_NEAR is used).
This commit is contained in:
Robin Gareus 2020-04-28 03:28:34 +02:00
parent 13ed8da2bc
commit d3d120fa28
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
3 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

27
libs/backends/alsa/alsa_audiobackend.cc
View file

@ -270,8 +270,27 @@ std::vector<uint32_t>
AlsaAudioBackend::available_period_sizes (const std::string& driver) const
{
std::vector<uint32_t> ps;
ps.push_back (2);
ps.push_back (3);
ALSADeviceInfo *nfo = NULL;
if (device == get_standard_device_name(DeviceNone)) {
return ps;
}
if (device == _output_audio_device && _output_audio_device_info.valid) {
nfo = &_output_audio_device_info;
} else {
ps.push_back (2);
return ps;
}
if (nfo->min_nper == 2) {
ps.push_back (2);
if (nfo->max_nper >= 3) {
ps.push_back (3);
}
} else {
ps.push_back (nfo->min_nper);
}
return ps;
}
@ -370,7 +389,7 @@ AlsaAudioBackend::set_sample_rate (float sr)
int
AlsaAudioBackend::set_peridod_size (uint32_t n)
{
if (n == 0 || n > 3) {
if (n == 0) {
return -1;
}
if (_run) {
@ -830,7 +849,7 @@ AlsaAudioBackend::_start (bool for_latency_measurement)
(duplex & 1) ? alsa_device.c_str() : NULL,
/* ctrl name */ 0,
_samplerate, _samples_per_period,
_periods_per_cycle, /* _periods_per_cycle */ 2,
_periods_per_cycle, /* capture p/c */ 2,
/* debug */ 0);
AudioBackend::ErrorCode error_code = NoError;