From: Tim Mayberry Date: Sat, 26 Sep 2015 22:53:19 +0000 (+1000) Subject: Return meaningful error codes when PortaudioBackend fails to start X-Git-Tag: 4.3~198 X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=aa713fcd833a037290e92ba59500354cba7f6cbb Return meaningful error codes when PortaudioBackend fails to start So they can be used to give a contextual error message in the GUI --- diff --git a/libs/backends/portaudio/portaudio_backend.cc b/libs/backends/portaudio/portaudio_backend.cc index b1c83349ae..3c8a238d71 100644 --- a/libs/backends/portaudio/portaudio_backend.cc +++ b/libs/backends/portaudio/portaudio_backend.cc @@ -480,8 +480,14 @@ PortAudioBackend::_start (bool for_latency_measurement) switch (err) { case paNoError: break; + case paBadIODeviceCombination: + return DeviceConfigurationNotSupportedError; + case paInvalidChannelCount: + return ChannelCountNotSupportedError; + case paInvalidSampleRate: + return SampleRateNotSupportedError; default: - return -1; + return AudioDeviceOpenError; } if (_n_outputs != _pcmio->n_playback_channels ()) {