use new error-messages
authorRobin Gareus <robin@gareus.org>
Fri, 2 Oct 2015 15:51:17 +0000 (17:51 +0200)
committerRobin Gareus <robin@gareus.org>
Fri, 2 Oct 2015 15:51:17 +0000 (17:51 +0200)
libs/backends/alsa/alsa_audiobackend.cc
libs/backends/coreaudio/coreaudio_backend.cc
libs/backends/dummy/dummy_audiobackend.cc
libs/backends/portaudio/portaudio_backend.cc

index 36ea6a5cc8bc23764b0c9107936b30b61b44b3f2..b0997a6202bbb2524f2db4844d767b1a6a69a5c7 100644 (file)
@@ -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
index 7ff97c660b702496d644354a527654558a687a07..36fa3d46a5749360aefb7d2c58eec5d9885d1a20 100644 (file)
@@ -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
index 2245f17e6cd92cea3474f9f521a36cd6c45d0538..a59d7e31788ccf730513558d11b38a2552144217 100644 (file)
@@ -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
index 3c8a238d712fb58e373c3f271eb1bb2a2ad328ac..3329deee7ebf72c75f55764cb3c3951bd81faf8c 100644 (file)
@@ -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