diff --git a/3rdparty/XAudio2Redist/include/xaudio2redist.h b/3rdparty/XAudio2Redist/include/xaudio2redist.h index 7055f9cf11..c27a9218a6 100644 --- a/3rdparty/XAudio2Redist/include/xaudio2redist.h +++ b/3rdparty/XAudio2Redist/include/xaudio2redist.h @@ -18,10 +18,10 @@ // Current name of the DLL shipped in the same SDK as this header. // The name reflects the current version -#define XAUDIO2_DLL_A "xaudio2redist.dll" -#define XAUDIO2_DLL_W L"xaudio2redist.dll" -#define XAUDIO2D_DLL_A "xaudio2redist.dll" -#define XAUDIO2D_DLL_W L"xaudio2redist.dll" +#define XAUDIO2_DLL_A "xaudio2_9redist.dll" +#define XAUDIO2_DLL_W L"xaudio2_9redist.dll" +#define XAUDIO2D_DLL_A "xaudio2_9redist.dll" +#define XAUDIO2D_DLL_W L"xaudio2_9redist.dll" #ifdef UNICODE #define XAUDIO2_DLL XAUDIO2_DLL_W @@ -446,7 +446,7 @@ DECLARE_INTERFACE_(IXAudio2, IUnknown) // ARGUMENTS: // pCallback - Callback interface to be called during each processing pass. // - STDMETHOD(RegisterForCallbacks) (_In_ IXAudio2EngineCallback* pCallback) PURE; + STDMETHOD(RegisterForCallbacks) (THIS_ _In_ IXAudio2EngineCallback* pCallback) PURE; // NAME: IXAudio2::UnregisterForCallbacks // DESCRIPTION: Removes an existing receiver of XAudio2 engine callbacks. @@ -454,7 +454,7 @@ DECLARE_INTERFACE_(IXAudio2, IUnknown) // ARGUMENTS: // pCallback - Previously registered callback interface to be removed. // - STDMETHOD_(void, UnregisterForCallbacks) (_In_ IXAudio2EngineCallback* pCallback) PURE; + STDMETHOD_(void, UnregisterForCallbacks) (THIS_ _In_ IXAudio2EngineCallback* pCallback) PURE; // NAME: IXAudio2::CreateSourceVoice // DESCRIPTION: Creates and configures a source voice. @@ -1047,6 +1047,8 @@ DECLARE_INTERFACE(IXAudio2VoiceCallback) #define IXAudio2_QueryInterface(This,riid,ppvInterface) ((This)->lpVtbl->QueryInterface(This,riid,ppvInterface)) #define IXAudio2_AddRef(This) ((This)->lpVtbl->AddRef(This)) #define IXAudio2_Release(This) ((This)->lpVtbl->Release(This)) +#define IXAudio2_RegisterForCallbacks(This,pCallback) ((This)->lpVtbl->RegisterForCallbacks(This,pCallback)) +#define IXAudio2_UnregisterForCallbacks(This,pCallback) ((This)->lpVtbl->UnregisterForCallbacks(This,pCallback)) #define IXAudio2_CreateSourceVoice(This,ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain) ((This)->lpVtbl->CreateSourceVoice(This,ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain)) #define IXAudio2_CreateSubmixVoice(This,ppSubmixVoice,InputChannels,InputSampleRate,Flags,ProcessingStage,pSendList,pEffectChain) ((This)->lpVtbl->CreateSubmixVoice(This,ppSubmixVoice,InputChannels,InputSampleRate,Flags,ProcessingStage,pSendList,pEffectChain)) #define IXAudio2_CreateMasteringVoice(This,ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceId,pEffectChain,StreamCategory) ((This)->lpVtbl->CreateMasteringVoice(This,ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceId,pEffectChain,StreamCategory)) @@ -1215,7 +1217,7 @@ __inline float XAudio2CutoffFrequencyToRadians(float CutoffFrequency, UINT32 Sam { return XAUDIO2_MAX_FILTER_FREQUENCY; } - return 2.0f * sinf((float)M_PI * CutoffFrequency / SampleRate); + return 2.0f * sinf((float)M_PI * CutoffFrequency / (float)SampleRate); } // Convert from radian frequencies back to absolute frequencies in Hertz @@ -1234,7 +1236,7 @@ __inline float XAudio2CutoffFrequencyToOnePoleCoefficient(float CutoffFrequency, { return XAUDIO2_MAX_FILTER_FREQUENCY; } - return ( 1.0f - powf(1.0f - 2.0f * CutoffFrequency / SampleRate, 2.0f) ); + return ( 1.0f - powf(1.0f - 2.0f * CutoffFrequency / (float)SampleRate, 2.0f) ); } @@ -1271,4 +1273,3 @@ XAUDIO2_STDAPI XAudio2Create(_Outptr_ IXAudio2** ppXAudio2, UINT32 Flags X2DEFAU #endif // #ifndef GUID_DEFS_ONLY #endif // #ifndef __XAUDIO2_INCLUDED__ - diff --git a/3rdparty/XAudio2Redist/libs/xaudio2_9redist.lib b/3rdparty/XAudio2Redist/libs/xaudio2_9redist.lib index 6524756520..96eb038304 100644 Binary files a/3rdparty/XAudio2Redist/libs/xaudio2_9redist.lib and b/3rdparty/XAudio2Redist/libs/xaudio2_9redist.lib differ diff --git a/bin/xaudio2_9redist.dll b/bin/xaudio2_9redist.dll index 37f6cf3f8f..99b073a067 100755 Binary files a/bin/xaudio2_9redist.dll and b/bin/xaudio2_9redist.dll differ