From 87c36aba605b04ae4aae9bef410a472ecb763753 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 2 Oct 2015 17:51:17 +0200 Subject: use new error-messages --- libs/backends/alsa/alsa_audiobackend.cc | 18 +++++++++--------- libs/backends/coreaudio/coreaudio_backend.cc | 22 +++++++++++----------- libs/backends/dummy/dummy_audiobackend.cc | 10 +++++----- libs/backends/portaudio/portaudio_backend.cc | 12 ++++++------ 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc index 36ea6a5cc8..b0997a6202 100644 --- a/libs/backends/alsa/alsa_audiobackend.cc +++ b/libs/backends/alsa/alsa_audiobackend.cc @@ -682,7 +682,7 @@ AlsaAudioBackend::_start (bool for_latency_measurement) if (_active || _run) { PBD::error << _("AlsaAudioBackend: already active.") << endmsg; - return -1; + return BackendReinitializationError; } if (_ports.size()) { @@ -713,13 +713,13 @@ AlsaAudioBackend::_start (bool for_latency_measurement) if (_input_audio_device == get_standard_device_name(DeviceNone) && _output_audio_device == get_standard_device_name(DeviceNone)) { PBD::error << _("AlsaAudioBackend: At least one of input or output device needs to be set."); - return -1; + return AudioDeviceInvalidError; } if (_input_audio_device != _output_audio_device) { if (_input_audio_device != get_standard_device_name(DeviceNone) && _output_audio_device != get_standard_device_name(DeviceNone)) { PBD::error << _("AlsaAudioBackend: Cannot use two different devices."); - return -1; + return AudioDeviceInvalidError; } if (_input_audio_device != get_standard_device_name(DeviceNone)) { get_alsa_audio_device_names(devices, HalfDuplexIn); @@ -744,7 +744,7 @@ AlsaAudioBackend::_start (bool for_latency_measurement) } if (alsa_device == "") { PBD::error << _("AlsaAudioBackend: Cannot find configured device. Is it still connected?"); - return -1; + return AudioDeviceNotAvailableError; } acquire_device(alsa_device.c_str()); @@ -837,7 +837,7 @@ AlsaAudioBackend::_start (bool for_latency_measurement) PBD::error << _("AlsaAudioBackend: failed to register system ports.") << endmsg; delete _pcmi; _pcmi = 0; release_device(); - return -1; + return PortRegistrationError; } engine.sample_rate_change (_samplerate); @@ -847,7 +847,7 @@ AlsaAudioBackend::_start (bool for_latency_measurement) PBD::error << _("AlsaAudioBackend: Could not re-establish ports.") << endmsg; delete _pcmi; _pcmi = 0; release_device(); - return -1; + return PortReconnectError; } engine.reconnect_ports (); @@ -863,7 +863,7 @@ AlsaAudioBackend::_start (bool for_latency_measurement) delete _pcmi; _pcmi = 0; release_device(); _run = false; - return -1; + return ProcessThreadStartError; } else { PBD::warning << _("AlsaAudioBackend: cannot acquire realtime permissions.") << endmsg; } @@ -877,10 +877,10 @@ AlsaAudioBackend::_start (bool for_latency_measurement) delete _pcmi; _pcmi = 0; release_device(); _run = false; - return -1; + return ProcessThreadStartError; } - return 0; + return NoError; } int diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc index 7ff97c660b..36fa3d46a5 100644 --- a/libs/backends/coreaudio/coreaudio_backend.cc +++ b/libs/backends/coreaudio/coreaudio_backend.cc @@ -516,7 +516,7 @@ CoreAudioBackend::_start (bool for_latency_measurement) if (_active_ca || _active_fw || _run) { PBD::error << _("CoreAudioBackend: already active.") << endmsg; - return -1; + return BackendReinitializationError; } if (_ports.size()) { @@ -551,11 +551,11 @@ CoreAudioBackend::_start (bool for_latency_measurement) break; case -1: PBD::error << _("CoreAudioBackend: Invalid Device ID.") << endmsg; - error_code = BackendInitializationError; // XXX + error_code = AudioDeviceInvalidError; break; case -2: PBD::error << _("CoreAudioBackend: Failed to resolve Device-Component by ID.") << endmsg; - error_code = BackendInitializationError; // XXX + error_code = AudioDeviceNotAvailableError; break; case -3: PBD::error << _("CoreAudioBackend: failed to open device.") << endmsg; @@ -579,7 +579,7 @@ CoreAudioBackend::_start (bool for_latency_measurement) break; case -8: PBD::error << _("CoreAudioBackend: Cannot allocate buffers, out-of-memory.") << endmsg; - error_code = BackendInitializationError; // XXX + error_code = OutOfMemoryError; break; case -9: PBD::error << _("CoreAudioBackend: Failed to set device-property listeners.") << endmsg; @@ -587,7 +587,7 @@ CoreAudioBackend::_start (bool for_latency_measurement) break; case -10: PBD::error << _("CoreAudioBackend: Setting Process Callback failed.") << endmsg; - error_code = BackendInitializationError; // XXX + error_code = AudioDeviceIOError; break; case -11: PBD::error << _("CoreAudioBackend: cannot use requested period size.") << endmsg; @@ -650,7 +650,7 @@ CoreAudioBackend::_start (bool for_latency_measurement) if (register_system_audio_ports()) { PBD::error << _("CoreAudioBackend: failed to register system ports.") << endmsg; _run = false; - return -1; + return PortRegistrationError; } engine.sample_rate_change (_samplerate); @@ -659,7 +659,7 @@ CoreAudioBackend::_start (bool for_latency_measurement) if (engine.reestablish_ports ()) { PBD::error << _("CoreAudioBackend: Could not re-establish ports.") << endmsg; _run = false; - return -1; + return PortReconnectError; } if (pthread_create (&_freeewheel_thread, NULL, pthread_freewheel, this)) @@ -667,7 +667,7 @@ CoreAudioBackend::_start (bool for_latency_measurement) PBD::error << _("CoreAudioBackend: failed to create process thread.") << endmsg; delete _pcmio; _pcmio = 0; _run = false; - return -1; + return ProcessThreadStartError; } int timeout = 5000; @@ -684,14 +684,14 @@ CoreAudioBackend::_start (bool for_latency_measurement) unregister_ports(); _active_ca = false; _active_fw = false; - return -1; + return FreewheelThreadStartError; } if (!_active_ca) { PBD::error << _("CoreAudioBackend: failed to start coreaudio.") << endmsg; stop(); _run = false; - return -1; + return ProcessThreadStartError; } engine.reconnect_ports (); @@ -704,7 +704,7 @@ CoreAudioBackend::_start (bool for_latency_measurement) _pcmio->set_xrun_callback (xrun_callback_ptr, this); _preinit = false; - return 0; + return NoError; } int diff --git a/libs/backends/dummy/dummy_audiobackend.cc b/libs/backends/dummy/dummy_audiobackend.cc index 2245f17e6c..a59d7e3178 100644 --- a/libs/backends/dummy/dummy_audiobackend.cc +++ b/libs/backends/dummy/dummy_audiobackend.cc @@ -424,7 +424,7 @@ DummyAudioBackend::_start (bool /*for_latency_measurement*/) { if (_running) { PBD::error << _("DummyAudioBackend: already active.") << endmsg; - return -1; + return BackendReinitializationError; } if (_ports.size()) { @@ -441,7 +441,7 @@ DummyAudioBackend::_start (bool /*for_latency_measurement*/) if (register_system_ports()) { PBD::error << _("DummyAudioBackend: failed to register system ports.") << endmsg; - return -1; + return PortRegistrationError; } engine.sample_rate_change (_samplerate); @@ -452,7 +452,7 @@ DummyAudioBackend::_start (bool /*for_latency_measurement*/) if (engine.reestablish_ports ()) { PBD::error << _("DummyAudioBackend: Could not re-establish ports.") << endmsg; stop (); - return -1; + return PortReconnectError; } engine.reconnect_ports (); @@ -467,10 +467,10 @@ DummyAudioBackend::_start (bool /*for_latency_measurement*/) if (timeout == 0 || !_running) { PBD::error << _("DummyAudioBackend: failed to start process thread.") << endmsg; - return -1; + return ProcessThreadStartError; } - return 0; + return NoError; } int diff --git a/libs/backends/portaudio/portaudio_backend.cc b/libs/backends/portaudio/portaudio_backend.cc index 3c8a238d71..3329deee7e 100644 --- a/libs/backends/portaudio/portaudio_backend.cc +++ b/libs/backends/portaudio/portaudio_backend.cc @@ -451,7 +451,7 @@ PortAudioBackend::_start (bool for_latency_measurement) if (running()) { DEBUG_AUDIO("Already started.\n"); - return -1; + return BackendReinitializationError; } if (_ports.size()) { @@ -533,7 +533,7 @@ PortAudioBackend::_start (bool for_latency_measurement) if (register_system_midi_ports () != 0) { DEBUG_PORTS("Failed to register system midi ports.\n") _run = false; - return -1; + return PortRegistrationError; } DEBUG_AUDIO ("Registering Audio ports\n"); @@ -541,7 +541,7 @@ PortAudioBackend::_start (bool for_latency_measurement) if (register_system_audio_ports()) { DEBUG_PORTS("Failed to register system audio ports.\n"); _run = false; - return -1; + return PortRegistrationError; } engine.sample_rate_change (_samplerate); @@ -550,7 +550,7 @@ PortAudioBackend::_start (bool for_latency_measurement) if (engine.reestablish_ports ()) { DEBUG_PORTS("Could not re-establish ports.\n"); _run = false; - return -1; + return PortReconnectError; } engine.reconnect_ports (); @@ -558,10 +558,10 @@ PortAudioBackend::_start (bool for_latency_measurement) _port_change_flag = false; if (!start_blocking_process_thread()) { - return -1; + return ProcessThreadStartError; } - return 0; + return NoError; } bool -- cgit v1.2.3