ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2067 from RadWolfie/dsound-fixes 

Fix Audio Overall Volume Not Included From Input Sets of Volume
This commit is contained in:
PatrickvL 2020-12-09 23:50:35 +01:00 committed by GitHub
parent efee57a10c a02efe0466
commit fe0c2db158
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/hle/DSOUND/DirectSound/DirectSoundInline.hpp
View File

@ -1298,26 +1298,28 @@ static inline HRESULT HybridDirectSoundBuffer_SetMixBinVolumes_8(
HRESULT hRet = DSERR_INVALIDPARAM;
if (pMixBins != xbox::zeroptr && pMixBins->lpMixBinVolumePairs != xbox::zeroptr) {
LONG maxVolume = DSBVOLUME_MIN;
// Let's normalize audio level except for low frequency (subwoofer)
// Update the mixbin volume only, do not reassign volume pair array.
for (DWORD i = 0; i < pMixBins->dwCount; i++) {
// Update the mixbin volume only, do not reassign volume pair array.
const auto& it_in = pMixBins->lpMixBinVolumePairs[i];
auto it_out = std::find_if(Xb_VoiceProperties.MixBinVolumePairs, Xb_VoiceProperties.MixBinVolumePairs+Xb_VoiceProperties.dwMixBinCount,
auto it_out = std::find_if(Xb_VoiceProperties.MixBinVolumePairs, Xb_VoiceProperties.MixBinVolumePairs + Xb_VoiceProperties.dwMixBinCount,
[&it_in](const auto& e) {
return e.dwMixBin == it_in.dwMixBin;
});
// Once found a match, set the volume.
// NOTE If titles input duplicate with different volume,
// it will override previous value.
if (it_out != Xb_VoiceProperties.MixBinVolumePairs+Xb_VoiceProperties.dwMixBinCount) {
if (it_out != Xb_VoiceProperties.MixBinVolumePairs + Xb_VoiceProperties.dwMixBinCount) {
it_out->lVolume = it_in.lVolume;
}
}
// Since we cannot set per-channel volumes, we want to pick "dominant" volume
if (it_in.dwMixBin != XDSMIXBIN_LOW_FREQUENCY && it_in.dwMixBin < XDSMIXBIN_SPEAKERS_MAX) {
if (it_in.lVolume > maxVolume) {
maxVolume = it_in.lVolume;
// Since we cannot set per-channel volumes, we want to pick "dominant" volume
LONG maxVolume = DSBVOLUME_MIN;
for(unsigned i = 0; i < Xb_VoiceProperties.dwMixBinCount; i++) {
const auto& it_out = Xb_VoiceProperties.MixBinVolumePairs[i];
if (it_out.dwMixBin != XDSMIXBIN_LOW_FREQUENCY && it_out.dwMixBin < XDSMIXBIN_SPEAKERS_MAX) {
if (maxVolume < it_out.lVolume) {
maxVolume = it_out.lVolume;
}
}
}

14
src/core/hle/DSOUND/XbDSoundLogging.cpp
View File

@ -275,6 +275,20 @@ LOGRENDER(X_DSI3DL2BUFFER)
;
}
LOGRENDER(X_DSVOICEPROPS)
{
return os
LOGRENDER_MEMBER(dwMixBinCount)
LOGRENDER_MEMBER_ARRAY_TYPE(X_DSMIXBINVOLUMEPAIR, MixBinVolumePairs, dwMixBinCount)
LOGRENDER_MEMBER(lPitch)
LOGRENDER_MEMBER(l3DDistanceVolume)
LOGRENDER_MEMBER(l3DConeVolume)
LOGRENDER_MEMBER(l3DDopplerPitch)
LOGRENDER_MEMBER(lI3DL2DirectVolume)
LOGRENDER_MEMBER(lI3DL2RoomVolume)
;
}
LOGRENDER(X_DSI3DL2OBSTRUCTION)
{
return os

1
src/core/hle/DSOUND/XbDSoundLogging.hpp
View File

@ -83,6 +83,7 @@ LOGRENDER_HEADER(X_DSFILTERDESC)
LOGRENDER_HEADER(X_DSI3DL2BUFFER)
LOGRENDER_HEADER(X_DSI3DL2OBSTRUCTION)
LOGRENDER_HEADER(X_DSI3DL2OCCLUSION)
LOGRENDER_HEADER(X_DSVOICEPROPS)
LOGRENDER_HEADER(DSLFODESC)
LOGRENDER_HEADER(WAVEFORMATEX)
LOGRENDER_HEADER(XBOXADPCMWAVEFORMAT)