diff options
| author | Miller Puckette <millerpuckette@users.sourceforge.net> | 2006-08-11 20:09:07 +0000 |
|---|---|---|
| committer | Miller Puckette <millerpuckette@users.sourceforge.net> | 2006-08-11 20:09:07 +0000 |
| commit | 173b4e7033e4fc902d20a3cc19e9198a61924f37 (patch) | |
| tree | 7c0f909a98dab4bcda225d7fa478a8c721cbe00c /pd/portaudio | |
| parent | 9cba3b8fccf2f9d680d5ef7847689fe9cda2e294 (diff) | |
Fixed to compile correctly on macosx 10.3, 10.4 and Windows.
svn path=/trunk/; revision=5566
Diffstat (limited to 'pd/portaudio')
| -rw-r--r-- | pd/portaudio/pa_unix_oss/pa_unix_oss.c | 15 | ||||
| -rw-r--r-- | pd/portaudio/pa_win_wdmks/pa_win_wdmks.c | 2 | ||||
| -rw-r--r-- | pd/portaudio/pablio/ringbuffer.c | 2 | ||||
| -rw-r--r-- | pd/portaudio/pablio/ringbuffer.h | 2 |
4 files changed, 12 insertions, 9 deletions
diff --git a/pd/portaudio/pa_unix_oss/pa_unix_oss.c b/pd/portaudio/pa_unix_oss/pa_unix_oss.c index 221235d8..125fb8ce 100644 --- a/pd/portaudio/pa_unix_oss/pa_unix_oss.c +++ b/pd/portaudio/pa_unix_oss/pa_unix_oss.c @@ -1,5 +1,5 @@ /* - * $Id: pa_unix_oss.c,v 1.6.2.27 2006/02/21 19:13:56 bjornroche Exp $ + * $Id: pa_unix_oss.c,v 1.6.2.28 2006/03/20 18:22:06 aknudsen Exp $ * PortAudio Portable Real-Time Audio Library * Latest Version at: http://www.portaudio.com * OSS implementation by: @@ -530,12 +530,15 @@ static PaError BuildDeviceList( PaOSSHostApiRepresentation *ossApi ) PA_UNLESS( deviceInfos = (PaDeviceInfo **) realloc( deviceInfos, maxDeviceInfos * sizeof (PaDeviceInfo *) ), paInsufficientMemory ); } - deviceInfos[numDevices - 1] = deviceInfo; + { + int devIdx = numDevices - 1; + deviceInfos[devIdx] = deviceInfo; - if( commonApi->info.defaultInputDevice == paNoDevice && deviceInfo->maxInputChannels > 0 ) - commonApi->info.defaultInputDevice = i; - if( commonApi->info.defaultOutputDevice == paNoDevice && deviceInfo->maxOutputChannels > 0 ) - commonApi->info.defaultOutputDevice = i; + if( commonApi->info.defaultInputDevice == paNoDevice && deviceInfo->maxInputChannels > 0 ) + commonApi->info.defaultInputDevice = devIdx; + if( commonApi->info.defaultOutputDevice == paNoDevice && deviceInfo->maxOutputChannels > 0 ) + commonApi->info.defaultOutputDevice = devIdx; + } } /* Make an array of PaDeviceInfo pointers out of the linked list */ diff --git a/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c b/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c index ff05e384..45c40d0d 100644 --- a/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c +++ b/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c @@ -1,5 +1,5 @@ /* - * $Id: pa_win_wdmks.c,v 1.4 2006-06-03 19:13:07 millerpuckette Exp $ + * $Id: pa_win_wdmks.c,v 1.5 2006-08-11 20:09:07 millerpuckette Exp $ * PortAudio Windows WDM-KS interface * * Author: Andrew Baldwin diff --git a/pd/portaudio/pablio/ringbuffer.c b/pd/portaudio/pablio/ringbuffer.c index f1fc819e..35b2e631 100644 --- a/pd/portaudio/pablio/ringbuffer.c +++ b/pd/portaudio/pablio/ringbuffer.c @@ -1,5 +1,5 @@ /* - * $Id: ringbuffer.c,v 1.3 2006-08-07 23:08:10 millerpuckette Exp $ + * $Id: ringbuffer.c,v 1.4 2006-08-11 20:09:07 millerpuckette Exp $ * ringbuffer.c * Ring Buffer utility.. * diff --git a/pd/portaudio/pablio/ringbuffer.h b/pd/portaudio/pablio/ringbuffer.h index 8e16f2c7..7a06c6be 100644 --- a/pd/portaudio/pablio/ringbuffer.h +++ b/pd/portaudio/pablio/ringbuffer.h @@ -6,7 +6,7 @@ extern "C" #endif /* __cplusplus */ /* - * $Id: ringbuffer.h,v 1.4 2006-06-03 19:13:07 millerpuckette Exp $ + * $Id: ringbuffer.h,v 1.5 2006-08-11 20:09:07 millerpuckette Exp $ * ringbuffer.h * Ring Buffer utility.. * |