From 4cd89d77b82b7bf88f66f98871c8e6c7be7e419a Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Wed, 26 Aug 2020 01:52:42 -0500 Subject: [PATCH] dsound: remove extra parameter from HybridDirectSoundBuffer_SetMixBins --- src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp | 2 +- src/core/hle/DSOUND/DirectSound/DirectSoundInline.hpp | 3 +-- src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp b/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp index a9dba4dcc..0bf273573 100644 --- a/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp +++ b/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp @@ -1201,7 +1201,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMixBins) LOG_FUNC_END; EmuDirectSoundBuffer* pThis = pHybridThis->emuDSBuffer; - hRet = HybridDirectSoundBuffer_SetMixBins(pThis->Xb_VoiceProperties, pMixBins, pThis->EmuBufferDesc.lpwfxFormat, pThis->EmuBufferDesc); + hRet = HybridDirectSoundBuffer_SetMixBins(pThis->Xb_VoiceProperties, pMixBins, pThis->EmuBufferDesc); } return hRet; diff --git a/src/core/hle/DSOUND/DirectSound/DirectSoundInline.hpp b/src/core/hle/DSOUND/DirectSound/DirectSoundInline.hpp index a6d68bf20..068b815c2 100644 --- a/src/core/hle/DSOUND/DirectSound/DirectSoundInline.hpp +++ b/src/core/hle/DSOUND/DirectSound/DirectSoundInline.hpp @@ -1526,13 +1526,12 @@ static inline HRESULT HybridDirectSoundBuffer_GetVoiceProperties( static inline HRESULT HybridDirectSoundBuffer_SetMixBins( xbox::X_DSVOICEPROPS& Xb_VoiceProperties, xbox::X_LPDSMIXBINS in_MixBins, - ::LPCWAVEFORMATEX pwfxFormat, DSBUFFERDESC& BufferDesc ) { HRESULT ret = DS_OK; - GenerateMixBinDefault(Xb_VoiceProperties, pwfxFormat, in_MixBins, ((BufferDesc.dwFlags & DSBCAPS_CTRL3D) > 0)); + GenerateMixBinDefault(Xb_VoiceProperties, BufferDesc.lpwfxFormat, in_MixBins, ((BufferDesc.dwFlags & DSBCAPS_CTRL3D) > 0)); return ret; } diff --git a/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp b/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp index 1f3f1cf85..bfac481a2 100644 --- a/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp +++ b/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp @@ -1125,7 +1125,7 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMixBins) LOG_FUNC_ARG(pMixBins) LOG_FUNC_END; - hRet = HybridDirectSoundBuffer_SetMixBins(pThis->Xb_VoiceProperties, pMixBins, pThis->EmuBufferDesc.lpwfxFormat, pThis->EmuBufferDesc); + hRet = HybridDirectSoundBuffer_SetMixBins(pThis->Xb_VoiceProperties, pMixBins, pThis->EmuBufferDesc); }