diff options
4 files changed, 7 insertions, 7 deletions
diff --git a/3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c b/3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c index 35fac5f7f03..e8f21af1b14 100644 --- a/3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c +++ b/3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c @@ -47,11 +47,12 @@ */ //#define PA_WIN_DS_USE_WMME_TIMER +#define _WIN32_WINNT 0x0400 /* required to get waitable timer APIs */ + #include <assert.h> #include <stdio.h> #include <string.h> /* strlen() */ -#define _WIN32_WINNT 0x0400 /* required to get waitable timer APIs */ #include <initguid.h> /* make sure ds guids get defined */ #include <windows.h> #include <objbase.h> @@ -279,7 +280,7 @@ typedef struct PaWinDsStream UINT inputBufferSizeBytes; - int hostBufferSizeFrames; /* input and output host ringbuffers have the same number of frames */ + unsigned long hostBufferSizeFrames; /* input and output host ringbuffers have the same number of frames */ double framesWritten; double secondsPerHostByte; /* Used to optimize latency calculation for outTime */ double pollingPeriodSeconds; diff --git a/3rdparty/portaudio/src/hostapi/wasapi/mingw-include/audioclient.h b/3rdparty/portaudio/src/hostapi/wasapi/mingw-include/audioclient.h index 00da6fed5a3..9c36d1e65fb 100644 --- a/3rdparty/portaudio/src/hostapi/wasapi/mingw-include/audioclient.h +++ b/3rdparty/portaudio/src/hostapi/wasapi/mingw-include/audioclient.h @@ -1130,7 +1130,6 @@ EXTERN_C const IID IID_IChannelAudioVolume; /* interface __MIDL_itf_audioclient_0000_0007 */ /* [local] */ -#define FACILITY_AUDCLNT 0x889 #define AUDCLNT_ERR(n) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_AUDCLNT, n) #define AUDCLNT_SUCCESS(n) MAKE_SCODE(SEVERITY_SUCCESS, FACILITY_AUDCLNT, n) #define AUDCLNT_E_NOT_INITIALIZED AUDCLNT_ERR(0x001) diff --git a/3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c b/3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c index 70a48d8ffae..915ca2a0224 100644 --- a/3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c +++ b/3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c @@ -50,8 +50,6 @@ format conversion. That means that it will lock out all other users of a device for the duration of active stream using those devices */ -#include <stdio.h> - #if (defined(_WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) /* MSC version 6 and above */ #pragma comment( lib, "setupapi.lib" ) #endif @@ -62,11 +60,13 @@ of a device for the duration of active stream using those devices #define PA_LOGL_ #ifdef __GNUC__ -#include <initguid.h> #define _WIN32_WINNT 0x0501 #define WINVER 0x0501 +#include <initguid.h> #endif +#include <stdio.h> + #include <string.h> /* strlen() */ #include <assert.h> #include <wchar.h> /* iswspace() */ diff --git a/3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c b/3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c index 422c86714a7..7c4a369d99d 100644 --- a/3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c +++ b/3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c @@ -463,7 +463,7 @@ PaWinMmeDeviceInfo; #define PA_ENV_BUF_SIZE_ (32) #define PA_REC_IN_DEV_ENV_NAME_ ("PA_RECOMMENDED_INPUT_DEVICE") #define PA_REC_OUT_DEV_ENV_NAME_ ("PA_RECOMMENDED_OUTPUT_DEVICE") -static PaDeviceIndex GetEnvDefaultDeviceID( char *envName ) +static PaDeviceIndex GetEnvDefaultDeviceID( const char *envName ) { PaDeviceIndex recommendedIndex = paNoDevice; DWORD hresult; |