ardour/livetrax
13
0
Fork 0
Code

Use portaudio error codes in the PortaudioIO class.

Browse Source 
Having error codes defined in PortaudioIO means it is not dependent on the
ErrorCodes in AudioBackend but it doesn't really make sense to have another
set, so just use the PA ones until they become insufficient.
This commit is contained in:
Tim Mayberry 2015-09-26 20:49:41 +10:00
parent d19605aeaa
commit f178152114
3 changed files with 31 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/backends/portaudio/portaudio_backend.cc
View File

@ -469,22 +469,18 @@ PortAudioBackend::_start (bool for_latency_measurement)
_freewheeling = false;
_freewheel = false;
PortAudioIO::ErrorCode err;
PaErrorCode err = paNoError;
err = _pcmio->open_blocking_stream(name_to_id(_input_audio_device),
name_to_id(_output_audio_device),
_samplerate,
_samples_per_period);
// reintepret Portaudio error messages
switch (err) {
case PortAudioIO::NoError:
case paNoError:
break;
case PortAudioIO::DeviceConfigNotSupportedError:
PBD::error << get_error_string(DeviceConfigurationNotSupportedError)
<< endmsg;
return -1;
default:
PBD::error << get_error_string(AudioDeviceOpenError) << endmsg;
return -1;
}
@ -1450,7 +1446,7 @@ PortAudioBackend::main_blocking_process_thread ()
manager.registration_callback();
manager.graph_order_callback();
if (_pcmio->start_stream() != PortAudioIO::NoError) {
if (_pcmio->start_stream() != paNoError) {
_pcmio->close_stream ();
_active = false;
engine.halted_callback(get_error_string(AudioDeviceIOError).c_str());

43
libs/backends/portaudio/portaudio_io.cc
View File

@ -556,15 +556,15 @@ PortAudioIO::reset_stream_dependents ()
_cur_output_latency = 0;
}
PortAudioIO::ErrorCode
PaErrorCode
PortAudioIO::close_stream()
{
if (!_stream) return NoError;
if (!_stream) return paNoError;
PaError err = Pa_CloseStream (_stream);
if (err != paNoError) {
return StreamCloseError;
return (PaErrorCode)err;
}
_stream = NULL;
@ -572,18 +572,20 @@ PortAudioIO::close_stream()
free (_input_buffer); _input_buffer = NULL;
free (_output_buffer); _output_buffer = NULL;
return NoError;
return paNoError;
}
PortAudioIO::ErrorCode
PaErrorCode
PortAudioIO::start_stream()
{
PaError err = Pa_StartStream (_stream);
if (err != paNoError) {
return StreamStartError;
DEBUG_AUDIO(string_compose("PortAudio failed to start stream %1\n",
Pa_GetErrorText(err)));
return (PaErrorCode)err;
}
return NoError;
return paNoError;
}
bool
@ -702,7 +704,7 @@ PortAudioIO::get_output_stream_params(int device_output,
return true;
}
PortAudioIO::ErrorCode
PaErrorCode
PortAudioIO::pre_stream_open(int device_input,
PaStreamParameters& inputParam,
int device_output,
@ -710,7 +712,7 @@ PortAudioIO::pre_stream_open(int device_input,
{
if (!pa_initialize()) {
DEBUG_AUDIO ("PortAudio Initialization Failed\n");
return InitializationError;
return paNotInitialized;
}
reset_stream_dependents ();
@ -719,7 +721,7 @@ PortAudioIO::pre_stream_open(int device_input,
"PortAudio Device IDs: i:%1 o:%2\n", device_input, device_output));
if (device_input == DeviceNone && device_output == DeviceNone) {
return DeviceConfigNotSupportedError;
return paBadIODeviceCombination;
}
if (get_input_stream_params(device_input, inputParam)) {
@ -732,17 +734,17 @@ PortAudioIO::pre_stream_open(int device_input,
if (_capture_channels == 0 && _playback_channels == 0) {
DEBUG_AUDIO("PortAudio no input or output channels.\n");
return DeviceConfigNotSupportedError;
return paBadIODeviceCombination;
}
DEBUG_AUDIO (string_compose ("PortAudio Channels: in:%1 out:%2\n",
_capture_channels,
_playback_channels));
return NoError;
return paNoError;
}
PortAudioIO::ErrorCode
PaErrorCode
PortAudioIO::open_blocking_stream(int device_input,
int device_output,
double sample_rate,
@ -751,10 +753,10 @@ PortAudioIO::open_blocking_stream(int device_input,
PaStreamParameters inputParam;
PaStreamParameters outputParam;
ErrorCode error_code =
PaErrorCode error_code =
pre_stream_open(device_input, inputParam, device_output, outputParam);
if (error_code != NoError) return error_code;
if (error_code != paNoError) return error_code;
PaError err = paNoError;
@ -768,21 +770,22 @@ PortAudioIO::open_blocking_stream(int device_input,
NULL, NULL);
if (err != paNoError) {
DEBUG_AUDIO ("PortAudio failed to start stream.\n");
return StreamOpenError;
DEBUG_AUDIO(string_compose("PortAudio failed to open stream %1\n",
Pa_GetErrorText(err)));
return (PaErrorCode)err;
}
if (!set_sample_rate_and_latency_from_stream()) {
DEBUG_AUDIO ("PortAudio failed to query stream information.\n");
close_stream();
return StreamOpenError;
return paInternalError;
}
if (!allocate_buffers_for_blocking_api(samples_per_period)) {
close_stream();
return StreamOpenError;
return paInternalError;
}
return NoError;
return paNoError;
}
int

22
libs/backends/portaudio/portaudio_io.h
View File

@ -35,20 +35,6 @@ public:
PortAudioIO (void);
~PortAudioIO (void);
enum ErrorCode {
NoError = 0,
InitializationError,
DeInitializationError,
DeviceConfigNotSupportedError,
StreamOpenError,
StreamStartError,
StreamStopError,
StreamCloseError,
IOError,
BufferUnderrunError,
BufferOverrunError
};
enum StandardDevices {
DeviceNone = -2,
DeviceDefault = -1
@ -83,13 +69,13 @@ public:
std::string control_app_name (int device_id) const;
void launch_control_app (int device_id);
ErrorCode open_blocking_stream(int device_input,
PaErrorCode open_blocking_stream(int device_input,
int device_output,
double sample_rate,
uint32_t samples_per_period);
ErrorCode start_stream(void);
PaErrorCode start_stream(void);
ErrorCode close_stream(void);
PaErrorCode close_stream(void);
uint32_t n_playback_channels (void) const { return _playback_channels; }
uint32_t n_capture_channels (void) const { return _capture_channels; }
@ -129,7 +115,7 @@ private: // Methods
bool set_sample_rate_and_latency_from_stream();
bool allocate_buffers_for_blocking_api (uint32_t samples_per_period);
ErrorCode pre_stream_open(int device_input,
PaErrorCode pre_stream_open(int device_input,
PaStreamParameters& inputParam,
int device_output,
PaStreamParameters& outputParam);