diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2015-08-24 20:31:47 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2015-09-02 12:07:15 +1000 |
| commit | 8c2b9dac59a4f26007749a092cc36288d314e503 (patch) | |
| tree | c6055425c1f928a5d399bdd8aec6b1fd0630d166 /libs/backends/portaudio/portaudio_backend.cc | |
| parent | 82f84d620383951732349b7864b009a2fa43c04f (diff) | |
Rename several methods in PortAudioIO class
return ErrorCode's and handle them where necessary
Diffstat (limited to 'libs/backends/portaudio/portaudio_backend.cc')
| -rw-r--r-- | libs/backends/portaudio/portaudio_backend.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libs/backends/portaudio/portaudio_backend.cc b/libs/backends/portaudio/portaudio_backend.cc index 882fb47487..ddbf9d422b 100644 --- a/libs/backends/portaudio/portaudio_backend.cc +++ b/libs/backends/portaudio/portaudio_backend.cc @@ -458,10 +458,10 @@ PortAudioBackend::_start (bool for_latency_measurement) PortAudioIO::ErrorCode err; - err = _pcmio->pcm_setup(name_to_id(_input_audio_device), - name_to_id(_output_audio_device), - _samplerate, - _samples_per_period); + err = _pcmio->open_blocking_stream(name_to_id(_input_audio_device), + name_to_id(_output_audio_device), + _samplerate, + _samples_per_period); switch (err) { case PortAudioIO::NoError: @@ -558,7 +558,7 @@ PortAudioBackend::_start (bool for_latency_measurement) if (timeout == 0 || !_active) { DEBUG_AUDIO("Failed to start main audio thread\n"); - _pcmio->pcm_stop(); + _pcmio->close_stream(); _run = false; unregister_ports(); _active = false; @@ -1387,8 +1387,8 @@ PortAudioBackend::main_process_thread () manager.registration_callback(); manager.graph_order_callback(); - if (_pcmio->pcm_start()) { - _pcmio->pcm_stop (); + if (_pcmio->start_stream() != PortAudioIO::NoError) { + _pcmio->close_stream (); _active = false; engine.halted_callback(get_error_string(AudioDeviceIOError).c_str()); } @@ -1496,7 +1496,7 @@ PortAudioBackend::main_process_thread () /* call engine process callback */ if (engine.process_callback (_samples_per_period)) { - _pcmio->pcm_stop (); + _pcmio->close_stream (); _active = false; return 0; } @@ -1559,7 +1559,7 @@ PortAudioBackend::main_process_thread () // TODO clear midi or stop midi recv when entering fwheelin' if (engine.process_callback (_samples_per_period)) { - _pcmio->pcm_stop (); + _pcmio->close_stream(); _active = false; return 0; } @@ -1604,7 +1604,7 @@ PortAudioBackend::main_process_thread () } } - _pcmio->pcm_stop (); + _pcmio->close_stream(); _active = false; if (_run) { engine.halted_callback(get_error_string(AudioDeviceIOError).c_str()); |