diff --git a/common/JackMidiDriver.cpp b/common/JackMidiDriver.cpp index b98b8daa..1fbd1e38 100644 --- a/common/JackMidiDriver.cpp +++ b/common/JackMidiDriver.cpp @@ -34,19 +34,10 @@ JackMidiDriver::JackMidiDriver(const char* name, const char* alias, JackLockedEn : JackDriver(name, alias, engine, table), fCaptureChannels(0), fPlaybackChannels(0) -{ - for (int i = 0; i < DRIVER_PORT_NUM; i++) { - fRingBuffer[i] = NULL; - } -} +{} JackMidiDriver::~JackMidiDriver() -{ - for (int i = 0; i < fCaptureChannels; i++) { - if (fRingBuffer[i]) - jack_ringbuffer_free(fRingBuffer[i]); - } -} +{} int JackMidiDriver::Open(bool capturing, bool playing, @@ -60,11 +51,6 @@ int JackMidiDriver::Open(bool capturing, { fCaptureChannels = inchannels; fPlaybackChannels = outchannels; - - for (int i = 0; i < fCaptureChannels; i++) { - fRingBuffer[i] = jack_ringbuffer_create(sizeof(jack_default_audio_sample_t) * BUFFER_SIZE_MAX); - } - return JackDriver::Open(capturing, playing, inchannels, outchannels, monitor, capture_driver_name, playback_driver_name, capture_latency, playback_latency); } diff --git a/common/JackMidiDriver.h b/common/JackMidiDriver.h index fa471627..b7584bbe 100644 --- a/common/JackMidiDriver.h +++ b/common/JackMidiDriver.h @@ -40,8 +40,6 @@ class SERVER_EXPORT JackMidiDriver : public JackDriver int fCaptureChannels; int fPlaybackChannels; - jack_ringbuffer_t* fRingBuffer[DRIVER_PORT_NUM]; - jack_port_id_t fCapturePortList[DRIVER_PORT_NUM]; jack_port_id_t fPlaybackPortList[DRIVER_PORT_NUM]; diff --git a/windows/portaudio/JackPortAudioDriver.cpp b/windows/portaudio/JackPortAudioDriver.cpp index 603c1fff..a314e30c 100644 --- a/windows/portaudio/JackPortAudioDriver.cpp +++ b/windows/portaudio/JackPortAudioDriver.cpp @@ -82,7 +82,7 @@ namespace Jack : 0; outputParameters.hostApiSpecificStreamInfo = NULL; - PaError err = Pa_OpenStream(&fStream, + return Pa_OpenStream(&fStream, (fInputDevice == paNoDevice) ? 0 : &inputParameters, (fOutputDevice == paNoDevice) ? 0 : &outputParameters, fEngineControl->fSampleRate, @@ -90,8 +90,6 @@ namespace Jack paNoFlag, // Clipping is on... Render, this); - - return err; } int JackPortAudioDriver::Open(jack_nframes_t buffer_size,