Module: wine Branch: master Commit: cd8c46f9e434254b7585a75fb6ff0df9622551b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd8c46f9e434254b7585a75fb6ff0df...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Fri May 26 18:04:57 2023 +1000
xactengine: Correct interfaces for IXACT3Cue.
---
dlls/xactengine3_7/xact_dll.c | 4 ++-- include/xact3.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index b0f8ec13ac4..cb6b76cbf30 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -316,7 +316,7 @@ static HRESULT WINAPI IXACT3CueImpl_GetProperties(IXACT3Cue *iface, } #endif
-#if XACT3_VER >= 0x0300 +#if XACT3_VER >= 0x0305 static HRESULT WINAPI IXACT3CueImpl_SetOutputVoices(IXACT3Cue *iface, const XAUDIO2_VOICE_SENDS *pSendList) { @@ -356,7 +356,7 @@ static const IXACT3CueVtbl XACT3Cue_Vtbl = #if XACT3_VER >= 0x0205 IXACT3CueImpl_GetProperties, #endif -#if XACT3_VER >= 0x0300 +#if XACT3_VER >= 0x0305 IXACT3CueImpl_SetOutputVoices, IXACT3CueImpl_SetOutputVoiceMatrix #endif diff --git a/include/xact3.h b/include/xact3.h index a1df1a51330..99fd8dcea5b 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -487,8 +487,10 @@ DECLARE_INTERFACE(IXACT3Cue) STDMETHOD(GetVariable)(THIS_ XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE *nValue) PURE; STDMETHOD(Pause)(THIS_ BOOL fPause) PURE; STDMETHOD(GetProperties)(THIS_ LPXACT_CUE_INSTANCE_PROPERTIES *ppProperties) PURE; +#if XACT3_VER >= 0x0305 STDMETHOD(SetOutputVoices)(THIS_ const XAUDIO2_VOICE_SENDS *pSendList) PURE; STDMETHOD(SetOutputVoiceMatrix)(THIS_ IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, UINT32 DestinationChannels, const float *pLevelMatrix) PURE; +#endif }; #undef INTERFACE