me/portaudio
Watch
1
0
Fork
You've already forked portaudio
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed VS2010 compilation

Browse source
This commit is contained in:
Francesco Lamonica 2021-02-16 22:11:01 +01:00
commit 9ef2c28bb8
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/hostapi/wasapi/pa_win_wasapi.c
View file

@ -87,6 +87,10 @@
#include <mmdeviceapi.h> #include <mmdeviceapi.h>
#include <devicetopology.h> // Used to get IKsJackDescription interface #include <devicetopology.h> // Used to get IKsJackDescription interface
#undef INITGUID #undef INITGUID
// Visual Studio 2010 does not support the inline keyword
#if (_MSC_VER <= 1600)
#define inline _inline
#endif
#endif #endif
#ifndef __MWERKS__ #ifndef __MWERKS__
#include <malloc.h> #include <malloc.h>
@ -2078,6 +2082,7 @@ static PaDeviceInfo *AllocateDeviceListMemory(PaWasapiHostApiRepresentation *paW
if (paWasapi->deviceCount != 0) if (paWasapi->deviceCount != 0)
{ {
UINT32 i;
UINT32 deviceCount = paWasapi->deviceCount; UINT32 deviceCount = paWasapi->deviceCount;
#if defined(PA_WASAPI_MAX_CONST_DEVICE_COUNT) && (PA_WASAPI_MAX_CONST_DEVICE_COUNT > 0) #if defined(PA_WASAPI_MAX_CONST_DEVICE_COUNT) && (PA_WASAPI_MAX_CONST_DEVICE_COUNT > 0)
if (deviceCount < PA_WASAPI_MAX_CONST_DEVICE_COUNT) if (deviceCount < PA_WASAPI_MAX_CONST_DEVICE_COUNT)
@ -2089,7 +2094,7 @@ static PaDeviceInfo *AllocateDeviceListMemory(PaWasapiHostApiRepresentation *paW
{ {
return NULL; return NULL;
} }
for (UINT32 i = 0; i < deviceCount; ++i) for (i = 0; i < deviceCount; ++i)
hostApi->deviceInfos[i] = NULL; hostApi->deviceInfos[i] = NULL;
// Allocate all device info structs in a contiguous block // Allocate all device info structs in a contiguous block
@ -6091,6 +6096,7 @@ static inline INT32 GetNextSleepTime(SystemTimer *timer, ThreadIdleScheduler *sc
UINT32 sleepTime) UINT32 sleepTime)
{ {
INT32 nextSleepTime; INT32 nextSleepTime;
INT32 procTime;
// Get next sleep time // Get next sleep time
if (sleepTime == 0) if (sleepTime == 0)
@ -6104,7 +6110,7 @@ static inline INT32 GetNextSleepTime(SystemTimer *timer, ThreadIdleScheduler *sc
// //
// [9],{2},[8],{1},[9],{1},[9],{3},[7],{2},[8],{3},[7],{2},[8],{2},[8],{3},[7],{2},[8],... // [9],{2},[8],{1},[9],{1},[9],{3},[7],{2},[8],{3},[7],{2},[8],{2},[8],{3},[7],{2},[8],...
// //
INT32 procTime = (INT32)(SystemTimer_GetTime(timer) - startTime); procTime = (INT32)(SystemTimer_GetTime(timer) - startTime);
nextSleepTime -= procTime; nextSleepTime -= procTime;
if (nextSleepTime < timer->granularity) if (nextSleepTime < timer->granularity)
nextSleepTime = 0; nextSleepTime = 0;