ardour/livetrax
13
0
Fork 0
Code

Return meaningful error codes when ALSA backend fails to start

Browse Source 
Unfortunately it seems that in zita-alsa-pcmi doesn't set state() correctly in
some cases. Setting an invalid SR doesn't display the correct error message,
first guess would be that set_hwpar is failing and state() is not
representative of the actual error.
This commit is contained in:
Tim Mayberry 2015-09-26 21:03:02 +10:00
parent aa713fcd83
commit dcf327f86a
1 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libs/backends/alsa/alsa_audiobackend.cc
View File

@ -752,20 +752,48 @@ AlsaAudioBackend::_start (bool for_latency_measurement)
(duplex & 2) ? alsa_device.c_str() : NULL, (duplex & 2) ? alsa_device.c_str() : NULL,
(duplex & 1) ? alsa_device.c_str() : NULL, (duplex & 1) ? alsa_device.c_str() : NULL,
0, _samplerate, _samples_per_period, _periods_per_cycle, 0); 0, _samplerate, _samples_per_period, _periods_per_cycle, 0);
switch (_pcmi->state ()) {
case 0: /* OK */ break; AudioBackend::ErrorCode error_code = NoError;
case -1: PBD::error << _("AlsaAudioBackend: failed to open device.") << endmsg; break; switch (_pcmi->state()) {
case -2: PBD::error << _("AlsaAudioBackend: failed to allocate parameters.") << endmsg; break; case 0: /* OK */
case -3: PBD::error << _("AlsaAudioBackend: cannot set requested sample rate.") << endmsg; break; break;
case -4: PBD::error << _("AlsaAudioBackend: cannot set requested period size.") << endmsg; break; case -1:
case -5: PBD::error << _("AlsaAudioBackend: cannot set requested number of periods.") << endmsg; break; PBD::error << _("AlsaAudioBackend: failed to open device.") << endmsg;
case -6: PBD::error << _("AlsaAudioBackend: unsupported sample format.") << endmsg; break; error_code = AudioDeviceOpenError;
default: PBD::error << _("AlsaAudioBackend: initialization failed.") << endmsg; break; break;
case -2:
PBD::error << _("AlsaAudioBackend: failed to allocate parameters.") << endmsg;
error_code = AudioDeviceOpenError;
break;
case -3:
PBD::error << _("AlsaAudioBackend: cannot set requested sample rate.")
<< endmsg;
error_code = SampleRateNotSupportedError;
break;
case -4:
PBD::error << _("AlsaAudioBackend: cannot set requested period size.")
<< endmsg;
error_code = PeriodSizeNotSupportedError;
break;
case -5:
PBD::error << _("AlsaAudioBackend: cannot set requested number of periods.")
<< endmsg;
error_code = PeriodCountNotSupportedError;
break;
case -6:
PBD::error << _("AlsaAudioBackend: unsupported sample format.") << endmsg;
error_code = SampleFormatNotSupportedError;
break;
default:
PBD::error << _("AlsaAudioBackend: initialization failed.") << endmsg;
error_code = AudioDeviceOpenError;
break;
} }
if (_pcmi->state ()) { if (_pcmi->state ()) {
delete _pcmi; _pcmi = 0; delete _pcmi; _pcmi = 0;
release_device(); release_device();
return -1; return error_code;
} }
#ifndef NDEBUG #ifndef NDEBUG