From 9a7f96f15a08ece80288c4236f1de789ee72ea4d Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sat, 26 Sep 2015 17:02:37 +1000 Subject: Add a couple of error codes to AudioBackend::ErrorCode Also use the error message from ARDOUR_UI::reconnect_to_engine as the default error string --- libs/ardour/ardour/audio_backend.h | 2 ++ libs/ardour/audio_backend.cc | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/ardour/ardour/audio_backend.h b/libs/ardour/ardour/audio_backend.h index ed5b053274..27b6e7e2b5 100644 --- a/libs/ardour/ardour/audio_backend.h +++ b/libs/ardour/ardour/audio_backend.h @@ -101,12 +101,14 @@ class LIBARDOUR_API AudioBackend : public PortEngine { MidiDeviceNotAvailableError, MidiDeviceNotConnectedError, MidiDeviceIOError, + SampleFormatNotSupportedError, SampleRateNotSupportedError, RequestedInputLatencyNotSupportedError, RequestedOutputLatencyNotSupportedError, PeriodSizeNotSupportedError, PeriodCountNotSupportedError, DeviceConfigurationNotSupportedError, + ChannelCountNotSupportedError, InputChannelCountNotSupportedError, OutputChannelCountNotSupportedError, AquireRealtimePermissionError, diff --git a/libs/ardour/audio_backend.cc b/libs/ardour/audio_backend.cc index 225b64dbf1..35bff3b06e 100644 --- a/libs/ardour/audio_backend.cc +++ b/libs/ardour/audio_backend.cc @@ -55,6 +55,8 @@ AudioBackend::get_error_string (ErrorCode error_code) return _("MIDI device not connected"); case MidiDeviceIOError: return _("MIDI device Input/Output error"); + case SampleFormatNotSupportedError: + return _("Sample format is not supported"); case SampleRateNotSupportedError: return _("Sample rate is not supported"); case RequestedInputLatencyNotSupportedError: @@ -67,6 +69,8 @@ AudioBackend::get_error_string (ErrorCode error_code) return _("Period count is not supported"); case DeviceConfigurationNotSupportedError: return _("Device configuration not supported"); + case ChannelCountNotSupportedError: + return _("Channel count configuration not supported"); case InputChannelCountNotSupportedError: return _("Input channel count configuration not supported"); case OutputChannelCountNotSupportedError: @@ -78,7 +82,7 @@ AudioBackend::get_error_string (ErrorCode error_code) case SettingMIDIThreadPriorityError: return _("Setting MIDI device thread priorities failed"); } - return std::string(); + return _("Could not reconnect to Audio/MIDI engine"); } std::string -- cgit v1.2.3