From 468c6bceb7804fe739ce81871f0021ac598edc88 Mon Sep 17 00:00:00 2001 From: philburk Date: Sat, 1 Sep 2012 00:10:13 +0000 Subject: [PATCH] Fix some typos in docs. Fix some compiler warnings for win32. --- doc/src/tutorial/querying_devices.dox | 2 +- include/portaudio.h | 2 +- src/hostapi/dsound/pa_win_ds.c | 2 -- src/hostapi/wmme/pa_win_wmme.c | 12 ++++++++---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/doc/src/tutorial/querying_devices.dox b/doc/src/tutorial/querying_devices.dox index 2286060..b97cd11 100644 --- a/doc/src/tutorial/querying_devices.dox +++ b/doc/src/tutorial/querying_devices.dox @@ -30,7 +30,7 @@ If you want to get information about each device, simply loop through as follows } @endcode -The Pa_DeviceInfo structure contains a wealth of information such as the name of the devices, the default latency associated with the devices and more. The structure ihas the following fields: +The Pa_DeviceInfo structure contains a wealth of information such as the name of the devices, the default latency associated with the devices and more. The structure has the following fields: @code int structVersion diff --git a/include/portaudio.h b/include/portaudio.h index 2dcdf8f..1d23233 100644 --- a/include/portaudio.h +++ b/include/portaudio.h @@ -1021,7 +1021,7 @@ typedef struct PaStreamInfo /** Retrieve a pointer to a PaStreamInfo structure containing information about the specified stream. @return A pointer to an immutable PaStreamInfo structure. If the stream - parameter invalid, or an error is encountered, the function returns NULL. + parameter is invalid, or an error is encountered, the function returns NULL. @param stream A pointer to an open stream previously created with Pa_OpenStream. diff --git a/src/hostapi/dsound/pa_win_ds.c b/src/hostapi/dsound/pa_win_ds.c index f863cb1..60c202f 100644 --- a/src/hostapi/dsound/pa_win_ds.c +++ b/src/hostapi/dsound/pa_win_ds.c @@ -2728,8 +2728,6 @@ static void CALLBACK WaitableTimerAPCProc( PA_THREAD_FUNC ProcessingThreadProc( void *pArg ) { PaWinDsStream *stream = (PaWinDsStream *)pArg; - MMRESULT mmResult; - HANDLE hWaitableTimer; LARGE_INTEGER dueTime; int timerPeriodMs; diff --git a/src/hostapi/wmme/pa_win_wmme.c b/src/hostapi/wmme/pa_win_wmme.c index ec99085..fdd238b 100644 --- a/src/hostapi/wmme/pa_win_wmme.c +++ b/src/hostapi/wmme/pa_win_wmme.c @@ -709,7 +709,8 @@ static PaError InitializeInputDeviceInfo( PaWinMmeHostApiRepresentation *winMmeH { /* Append I/O suffix to WAVE_MAPPER device. */ deviceName = (char *)PaUtil_GroupAllocateMemory( - winMmeHostApi->allocations, StrTLen( wic.szPname ) + 1 + sizeof(constInputMapperSuffix_) ); + winMmeHostApi->allocations, + (long) (StrTLen( wic.szPname ) + 1 + sizeof(constInputMapperSuffix_)) ); if( !deviceName ) { result = paInsufficientMemory; @@ -721,7 +722,8 @@ static PaError InitializeInputDeviceInfo( PaWinMmeHostApiRepresentation *winMmeH else { deviceName = (char*)PaUtil_GroupAllocateMemory( - winMmeHostApi->allocations, StrTLen( wic.szPname ) + 1 ); + winMmeHostApi->allocations, + (long) (StrTLen( wic.szPname ) + 1) ); if( !deviceName ) { result = paInsufficientMemory; @@ -835,7 +837,8 @@ static PaError InitializeOutputDeviceInfo( PaWinMmeHostApiRepresentation *winMme { /* Append I/O suffix to WAVE_MAPPER device. */ deviceName = (char *)PaUtil_GroupAllocateMemory( - winMmeHostApi->allocations, StrTLen( woc.szPname ) + 1 + sizeof(constOutputMapperSuffix_) ); + winMmeHostApi->allocations, + (long) (StrTLen( woc.szPname ) + 1 + sizeof(constOutputMapperSuffix_)) ); if( !deviceName ) { result = paInsufficientMemory; @@ -847,7 +850,8 @@ static PaError InitializeOutputDeviceInfo( PaWinMmeHostApiRepresentation *winMme else { deviceName = (char*)PaUtil_GroupAllocateMemory( - winMmeHostApi->allocations, StrTLen( woc.szPname ) + 1 ); + winMmeHostApi->allocations, + (long) (StrTLen( woc.szPname ) + 1) ); if( !deviceName ) { result = paInsufficientMemory; -- 2.43.0