Commit fcf8c5ae authored by Stephane Letz's avatar Stephane Letz
Browse files

Typos.

parent b6f5e66d
2006-2013// Generated by ResEdit 1.4.3 // Generated by ResEdit 1.4.3
// Copyright (C) 2006-2008 // Copyright (C) 2006-2008
// http://www.resedit.net // http://www.resedit.net
......
...@@ -166,14 +166,14 @@ int JackPortAudioDriver::Open(jack_nframes_t buffer_size, ...@@ -166,14 +166,14 @@ int JackPortAudioDriver::Open(jack_nframes_t buffer_size,
int in_max = 0; int in_max = 0;
int out_max = 0; int out_max = 0;
PaError err = paNoError; PaError err = paNoError;
if (!fPaDevices) { if (!fPaDevices) {
fPaDevices = new PortAudioDevices(); fPaDevices = new PortAudioDevices();
} }
fCaptureLatency = capture_latency; fCaptureLatency = capture_latency;
fPlaybackLatency = playback_latency; fPlaybackLatency = playback_latency;
jack_log("JackPortAudioDriver::Open nframes = %ld in = %ld out = %ld capture name = %s playback name = %s samplerate = %ld", jack_log("JackPortAudioDriver::Open nframes = %ld in = %ld out = %ld capture name = %s playback name = %s samplerate = %ld",
buffer_size, inchannels, outchannels, capture_driver_uid, playback_driver_uid, samplerate); buffer_size, inchannels, outchannels, capture_driver_uid, playback_driver_uid, samplerate);
...@@ -188,13 +188,13 @@ int JackPortAudioDriver::Open(jack_nframes_t buffer_size, ...@@ -188,13 +188,13 @@ int JackPortAudioDriver::Open(jack_nframes_t buffer_size,
goto error; goto error;
} }
} }
// If ASIO, request for preferred size (assuming fInputDevice and fOutputDevice are the same) // If ASIO, request for preferred size (assuming fInputDevice and fOutputDevice are the same)
if (buffer_size == 0) { if (buffer_size == 0) {
buffer_size = fPaDevices->GetPreferredBufferSize(fInputDevice); buffer_size = fPaDevices->GetPreferredBufferSize(fInputDevice);
jack_log("JackPortAudioDriver::Open preferred buffer_size = %d", buffer_size); jack_log("JackPortAudioDriver::Open preferred buffer_size = %d", buffer_size);
} }
// Generic JackAudioDriver Open // Generic JackAudioDriver Open
if (JackAudioDriver::Open(buffer_size, samplerate, capturing, playing, inchannels, outchannels, monitor, if (JackAudioDriver::Open(buffer_size, samplerate, capturing, playing, inchannels, outchannels, monitor,
capture_driver_uid, playback_driver_uid, capture_latency, playback_latency) != 0) { capture_driver_uid, playback_driver_uid, capture_latency, playback_latency) != 0) {
...@@ -303,7 +303,7 @@ int JackPortAudioDriver::Start() ...@@ -303,7 +303,7 @@ int JackPortAudioDriver::Start()
if ((err = Pa_StartStream(fStream)) == paNoError) { if ((err = Pa_StartStream(fStream)) == paNoError) {
return 0; return 0;
} }
jack_error("Pa_StartStream error = %s", Pa_GetErrorText(err)) jack_error("Pa_StartStream error = %s", Pa_GetErrorText(err));
JackAudioDriver::Stop(); JackAudioDriver::Stop();
} }
return -1; return -1;
...@@ -331,11 +331,11 @@ int JackPortAudioDriver::SetBufferSize(jack_nframes_t buffer_size) ...@@ -331,11 +331,11 @@ int JackPortAudioDriver::SetBufferSize(jack_nframes_t buffer_size)
jack_error("Pa_CloseStream error = %s", Pa_GetErrorText(err)); jack_error("Pa_CloseStream error = %s", Pa_GetErrorText(err));
goto error; goto error;
} }
// It seems that some ASIO drivers (like ASIO4All) needs this to restart correctly; // It seems that some ASIO drivers (like ASIO4All) needs this to restart correctly;
delete fPaDevices; delete fPaDevices;
fPaDevices = new PortAudioDevices(); fPaDevices = new PortAudioDevices();
err = OpenStream(buffer_size); err = OpenStream(buffer_size);
if (err != paNoError) { if (err != paNoError) {
jack_error("Pa_OpenStream error = %s", Pa_GetErrorText(err)); jack_error("Pa_OpenStream error = %s", Pa_GetErrorText(err));
...@@ -344,7 +344,7 @@ int JackPortAudioDriver::SetBufferSize(jack_nframes_t buffer_size) ...@@ -344,7 +344,7 @@ int JackPortAudioDriver::SetBufferSize(jack_nframes_t buffer_size)
JackAudioDriver::SetBufferSize(buffer_size); // Generic change, never fails JackAudioDriver::SetBufferSize(buffer_size); // Generic change, never fails
return 0; return 0;
} }
error: error:
fStream = NULL; fStream = NULL;
return -1; return -1;
......
...@@ -36,12 +36,12 @@ class JackPortAudioDriver : public JackMMCSS, public JackAudioDriver ...@@ -36,12 +36,12 @@ class JackPortAudioDriver : public JackMMCSS, public JackAudioDriver
private: private:
PortAudioDevices* fPaDevices;
PaStream* fStream; PaStream* fStream;
jack_default_audio_sample_t** fInputBuffer; jack_default_audio_sample_t** fInputBuffer;
jack_default_audio_sample_t** fOutputBuffer; jack_default_audio_sample_t** fOutputBuffer;
PaDeviceIndex fInputDevice; PaDeviceIndex fInputDevice;
PaDeviceIndex fOutputDevice; PaDeviceIndex fOutputDevice;
PortAudioDevices* fPaDevices;
static int Render(const void* inputBuffer, void* outputBuffer, static int Render(const void* inputBuffer, void* outputBuffer,
unsigned long framesPerBuffer, unsigned long framesPerBuffer,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment