smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-07 22:25:46 +01:00
Code Issues Projects Releases Wiki Activity

Remove unused and cryptic _state member from PortAudioIO

Browse source
This commit is contained in:
Tim Mayberry 2015-08-24 12:15:06 +10:00
parent fd0b54f459
commit 3b71674eee
2 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libs/backends/portaudio/portaudio_io.cc
View file

@ -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;

3
libs/backends/portaudio/portaudio_io.h
View file

@ -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;