diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2015-08-24 12:15:06 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2015-09-02 12:07:15 +1000 |
| commit | 3b71674eeea6f00ff127ee0c679c28682aa85a1f (patch) | |
| tree | 5f399f66d378e5634dc9c87cf3617a62747d256d /libs/backends/portaudio | |
| parent | fd0b54f4593b68bcebb7a5c4b3acab3c437e0fff (diff) | |
Remove unused and cryptic _state member from PortAudioIO
Diffstat (limited to 'libs/backends/portaudio')
| -rw-r--r-- | libs/backends/portaudio/portaudio_io.cc | 14 | ||||
| -rw-r--r-- | libs/backends/portaudio/portaudio_io.h | 3 |
2 files changed, 3 insertions, 14 deletions
diff --git a/libs/backends/portaudio/portaudio_io.cc b/libs/backends/portaudio/portaudio_io.cc index 698eab30de..5ca99d1677 100644 --- a/libs/backends/portaudio/portaudio_io.cc +++ b/libs/backends/portaudio/portaudio_io.cc @@ -42,8 +42,7 @@ using namespace PBD; using namespace ARDOUR; PortAudioIO::PortAudioIO () - : _state (-1) - , _initialized (false) + : _initialized (false) , _capture_channels (0) , _playback_channels (0) , _stream (0) @@ -58,9 +57,8 @@ PortAudioIO::PortAudioIO () PortAudioIO::~PortAudioIO () { - if (_state == 0) { - pcm_stop(); - } + pcm_stop(); + if (_initialized) { Pa_Terminate(); } @@ -550,7 +548,6 @@ PortAudioIO::pcm_stop () free (_input_buffer); _input_buffer = NULL; free (_output_buffer); _output_buffer = NULL; - _state = -1; } int @@ -559,7 +556,6 @@ PortAudioIO::pcm_start() PaError err = Pa_StartStream (_stream); if (err != paNoError) { - _state = -1; return -1; } return 0; @@ -686,8 +682,6 @@ PortAudioIO::pcm_setup ( int device_input, int device_output, double sample_rate, uint32_t samples_per_period) { - _state = -2; - if (!initialize_pa()) { DEBUG_AUDIO ("PortAudio Initialization Failed\n"); return InitializationError; @@ -745,8 +739,6 @@ PortAudioIO::pcm_setup ( return StreamOpenError; } - _state = 0; - if (!allocate_buffers_for_blocking_api(samples_per_period)) { pcm_stop(); return StreamOpenError; diff --git a/libs/backends/portaudio/portaudio_io.h b/libs/backends/portaudio/portaudio_io.h index 3c21deccee..6daa13d5ea 100644 --- a/libs/backends/portaudio/portaudio_io.h +++ b/libs/backends/portaudio/portaudio_io.h @@ -35,8 +35,6 @@ public: PortAudioIO (void); ~PortAudioIO (void); - int state (void) const { return _state; } - enum ErrorCode { NoError = 0, InitializationError, @@ -132,7 +130,6 @@ private: // Methods static void get_default_buffer_sizes(std::vector<uint32_t>&); private: // Data - int _state; bool _initialized; uint32_t _capture_channels; |