From a035864c3177b9fc6387be88ee989070fdecd4bd Mon Sep 17 00:00:00 2001 From: sletz Date: Thu, 26 Feb 2009 13:52:06 +0000 Subject: [PATCH] Correct JackPortAudioAdapter on Windows. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3362 0c269be4-1314-0410-8aa9-9f06e86f4224 --- windows/portaudio/JackPortAudioAdapter.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/windows/portaudio/JackPortAudioAdapter.cpp b/windows/portaudio/JackPortAudioAdapter.cpp index a7aa9619..7f78948d 100644 --- a/windows/portaudio/JackPortAudioAdapter.cpp +++ b/windows/portaudio/JackPortAudioAdapter.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. namespace Jack { - + int JackPortAudioAdapter::Render(const void* inputBuffer, void* outputBuffer, unsigned long framesPerBuffer, @@ -36,9 +36,9 @@ namespace Jack { JackPortAudioAdapter* adapter = static_cast(userData); adapter->PushAndPull((float**)inputBuffer, (float**)outputBuffer, framesPerBuffer); - return noErr; + return paContinue; } - + JackPortAudioAdapter::JackPortAudioAdapter ( jack_nframes_t buffer_size, jack_nframes_t sample_rate, const JSList* params ) : JackAudioAdapterInterface ( buffer_size, sample_rate ) { @@ -217,7 +217,7 @@ extern "C" strcpy(desc->name, "audioadapter"); // size MUST be less then JACK_DRIVER_NAME_MAX + 1 strcpy(desc->desc, "netjack audio <==> net backend adapter"); // size MUST be less then JACK_DRIVER_PARAM_DESC + 1 - + desc->nparams = 10; desc->params = (jack_driver_param_desc_t*)calloc(desc->nparams, sizeof(jack_driver_param_desc_t)); @@ -285,7 +285,7 @@ extern "C" desc->params[i].value.i = TRUE; strcpy(desc->params[i].short_desc, "Display available PortAudio devices"); strcpy(desc->params[i].long_desc, desc->params[i].short_desc); - + i++; strcpy(desc->params[i].name, "quality"); desc->params[i].character = 'q'; @@ -293,7 +293,7 @@ extern "C" desc->params[i].value.ui = 0; strcpy(desc->params[i].short_desc, "Resample algorithm quality (0 - 4)"); strcpy(desc->params[i].long_desc, desc->params[i].short_desc); - + i++; strcpy(desc->params[i].name, "ring-buffer"); desc->params[i].character = 'g';