From c0c21253ecf8cb0336aae064673082d1da3daff2 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Wed, 3 Jul 2019 12:09:27 -0500 Subject: [PATCH] Add GetVoiceProperties and SetMixBins hybrid functions --- .../DSOUND/DirectSound/DirectSoundInline.hpp | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/core/hle/DSOUND/DirectSound/DirectSoundInline.hpp b/src/core/hle/DSOUND/DirectSound/DirectSoundInline.hpp index 6a66c5e4f..3996b336e 100644 --- a/src/core/hle/DSOUND/DirectSound/DirectSoundInline.hpp +++ b/src/core/hle/DSOUND/DirectSound/DirectSoundInline.hpp @@ -1932,4 +1932,39 @@ inline HRESULT HybridDirectSoundBuffer_Unlock( return DS_OK; }//*/ +inline HRESULT HybridDirectSoundBuffer_GetVoiceProperties( + XTL::X_DSVOICEPROPS& Xb_VoiceProperties, + XTL::X_DSVOICEPROPS* out_VoiceProperties +) +{ + enterCriticalSection; + + HRESULT ret = DS_OK; + + if (out_VoiceProperties != xbnullptr) { + // Simply copy the data from Xb_VoiceProperties. + *out_VoiceProperties = Xb_VoiceProperties; + } + else { + ret = DSERR_INVALIDPARAM; + } + + leaveCriticalSection; + + return ret; +} + +inline HRESULT HybridDirectSoundBuffer_SetMixBins( + XTL::X_DSVOICEPROPS& Xb_VoiceProperties, + XTL::X_LPDSMIXBINS in_MixBins, + LPCWAVEFORMATEX pwfxFormat, + DSBUFFERDESC& BufferDesc +) +{ + HRESULT ret = DS_OK; + + GenerateMixBinDefault(Xb_VoiceProperties, pwfxFormat, in_MixBins, ((BufferDesc.dwFlags & DSBCAPS_CTRL3D) > 0)); + + return ret; +} #endif