summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Mayberry <mojofunk@gmail.com>2015-09-26 17:02:37 +1000
committerTim Mayberry <mojofunk@gmail.com>2015-10-01 09:10:19 +1000
commit9a7f96f15a08ece80288c4236f1de789ee72ea4d (patch)
tree9b4ef1872fb7fd79167e6279a056db803029e9ac
parentc6f9a65081176506fd44871f052948b1b1a1a013 (diff)
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
-rw-r--r--libs/ardour/ardour/audio_backend.h2
-rw-r--r--libs/ardour/audio_backend.cc6
2 files changed, 7 insertions, 1 deletions
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