From 05607e31243e5e85a3801d4513192bb1f2150b14 Mon Sep 17 00:00:00 2001 From: Miller Puckette Date: Mon, 30 May 2005 03:04:19 +0000 Subject: Remembered to update all the edited files. Should now be in sync... will have to test it though. svn path=/trunk/; revision=3092 --- pd/portaudio/pa_common/pa_converters.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'pd/portaudio/pa_common/pa_converters.c') diff --git a/pd/portaudio/pa_common/pa_converters.c b/pd/portaudio/pa_common/pa_converters.c index 28ea106f..4ee73c9a 100644 --- a/pd/portaudio/pa_common/pa_converters.c +++ b/pd/portaudio/pa_common/pa_converters.c @@ -1,5 +1,5 @@ /* - * $Id: pa_converters.c,v 1.1.2.25 2004/04/15 10:05:06 rossbencina Exp $ + * $Id: pa_converters.c,v 1.1.2.26 2004/12/11 16:32:38 aknudsen Exp $ * Portable Audio I/O Library sample conversion mechanism * * Based on the Open Source API proposed by Ross Bencina @@ -52,6 +52,7 @@ #include "pa_converters.h" #include "pa_dither.h" #include "pa_endianness.h" +#include "pa_types.h" PaSampleFormat PaUtil_SelectClosestAvailableFormat( @@ -1659,8 +1660,8 @@ static void Copy_16_To_16( void *sourceBuffer, signed int sourceStride, unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator ) { - unsigned short *src = (unsigned short*)sourceBuffer; - unsigned short *dest = (unsigned short*)destinationBuffer; + PaUint16 *src = (PaUint16 *)sourceBuffer; + PaUint16 *dest = (PaUint16 *)destinationBuffer; (void) ditherGenerator; /* unused parameter */ @@ -1703,8 +1704,8 @@ static void Copy_32_To_32( void *sourceBuffer, signed int sourceStride, unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator ) { - unsigned long *dest = (unsigned long*)destinationBuffer; - unsigned long *src = (unsigned long*)sourceBuffer; + PaUint32 *dest = (PaUint32 *)destinationBuffer; + PaUint32 *src = (PaUint32 *)sourceBuffer; (void) ditherGenerator; /* unused parameter */ @@ -1868,7 +1869,7 @@ static void Zero8( void *destinationBuffer, signed int destinationStride, static void Zero16( void *destinationBuffer, signed int destinationStride, unsigned int count ) { - unsigned short *dest = (unsigned short*)destinationBuffer; + PaUint16 *dest = (PaUint16 *)destinationBuffer; while( count-- ) { @@ -1900,7 +1901,7 @@ static void Zero24( void *destinationBuffer, signed int destinationStride, static void Zero32( void *destinationBuffer, signed int destinationStride, unsigned int count ) { - unsigned long *dest = (unsigned long*)destinationBuffer; + PaUint32 *dest = (PaUint32 *)destinationBuffer; while( count-- ) { -- cgit v1.2.1